[mapguide-commits] r5614 - in trunk/Tools/Maestro:
ExtendedModels/SymbolDefinition-1.1.0 Generated
Maestro.AddIn.ExtendedObjectModels
Maestro.AddIn.ExtendedObjectModels/Commands
Maestro.AddIn.ExtendedObjectModels/Properties
Maestro.AddIn.ExtendedObjectModels/Templates Maestro.Base
Maestro.Base/Properties Maestro.Base/Templates Maestro.Editors
Maestro.Editors/Common Maestro.Editors/DrawingSource
Maestro.Editors/FeatureSource Maestro.Editors/FeatureSource/Extensions
Maestro.Editors/FeatureSource/Preview
Maestro.Editors/FeatureSource/Providers
Maestro.Editors/FeatureSource/Providers/Gdal
Maestro.Editors/FeatureSource/Providers/Odbc
Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor
Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors
Maestro.Editors/FeatureSource/Providers/Rdbms
Maestro.Editors/FeatureSource/Providers/SQLite
Maestro.Editors/FeatureSource/Providers/Sdf
Maestro.Editors/FeatureSource/Providers/Shp Maestro.Editors/Fusion
Maestro.Editors/Fusion/WidgetEditors Maestr
o.Editors/LayerDefinition Maestro.Editors/LayerDefinition/Raster
Maestro.Editors/LayerDefinition/Vector
Maestro.Editors/LayerDefinition/Vector/Scales
Maestro.Editors/LayerDefinition/Vector/StyleEditors
Maestro.Editors/LoadProcedure Maestro.Editors/MapDefinition
Maestro.Editors/PrintLayout Maestro.Editors/WebLayout
Maestro.Editors/WebLayout/Commands OSGeo.MapGuide.MaestroAPI
OSGeo.MapGuide.MaestroAPI/ObjectModels OSGeo.MapGuide.MaestroAPI/Properties
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Mar 9 08:17:54 EST 2011
Author: jng
Date: 2011-03-09 05:17:54 -0800 (Wed, 09 Mar 2011)
New Revision: 5614
Added:
trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/SymbolDefinition110ItemTemplate.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefFactory.cs
Modified:
trunk/Tools/Maestro/ExtendedModels/SymbolDefinition-1.1.0/OSGeo.MapGuide.ObjectModels.SymbolDefinition-1.1.0.csproj
trunk/Tools/Maestro/Generated/SymbolDefinition-1.0.0.designer.cs
trunk/Tools/Maestro/Generated/SymbolDefinition-1.1.0.designer.cs
trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Commands/StartupCommand.cs
trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Maestro.AddIn.ExtendedObjectModels.csproj
trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Properties/Resources.Designer.cs
trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Properties/Resources.resx
trunk/Tools/Maestro/Maestro.Base/Maestro.Base.addin
trunk/Tools/Maestro/Maestro.Base/Properties/Resources.Designer.cs
trunk/Tools/Maestro/Maestro.Base/Properties/Resources.resx
trunk/Tools/Maestro/Maestro.Base/Templates/SymbolDefinitionItemTemplate.cs
trunk/Tools/Maestro/Maestro.Editors/Common/EditorBindableCollapsiblePanel.cs
trunk/Tools/Maestro/Maestro.Editors/DrawingSource/DrawingSourceEditorCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/DrawingSource/SourceSectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/EditorBase.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/CoordSysOverrideCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/CalculationSettings.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/ExtendedClassSettings.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/JoinSettings.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/ExtensionsCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/PreviewPane.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/SqlQueryCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/StandardQueryCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/FileBasedCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/GdalProviderCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/SingleFileCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/GenericCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcProviderCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableConfigCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableConfigurationDialog.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/ConnectionStringCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/DSNCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/KnownDriversCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/ManagedCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/MySqlCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/PostgreSqlCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/SqlServerSpatialCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/SQLite/SQLiteFileCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Sdf/SdfFileCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Shp/ShpFileCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexLayoutSettingsCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/MapSettingsCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/NewWidgetDialog.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/AboutWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/ActivityIndicatorWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/BufferPanelWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/BufferWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/CenterSelectionWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/ClearSelectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/ColorPickerWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/CursorPositionWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/EditableScaleWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/ExtentHistoryWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/FeatureInfoWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/GenericWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/HelpWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/InitialMapViewWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/InvokeScriptWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/LegendWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/LinkToViewWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/MapMenuWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/MapTipWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/MeasureWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/NavigatorWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/PanWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/RefreshMapWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/SelectionPanelWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetManagementDialog.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetReferenceCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetSettingsCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/LayerPropertiesSectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerAdvancedSectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerVisibilitySectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/Condition.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionList.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionListButtons.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ItemStyle.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRange.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeConditions.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeList.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FillStyleEditor.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineFeatureStyleEditor.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineStyleEditor.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ScaleRangeEditor.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/DwfTransformationCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/ExecuteCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/InputFilesCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/LoadTargetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/SdfTransformationCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/ShpTransformationCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/SqliteTransformationCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/FiniteScaleListCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/GroupPropertiesCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapSettingsSectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/PrintLayout/PrintCustomLogosSectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/PrintLayout/PrintCustomTextSectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/PrintLayout/PrintPagePropertiesSectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/WebLayout/Commands/InvokeScriptCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/WebLayout/Commands/InvokeURLCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/WebLayout/Commands/SearchCmdCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/WebLayout/CustomCommandPropertyCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/WebLayout/MenuEditorCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutCommandsCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutMenusCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ObjectFactory.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefinition.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolInterfaces.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Properties/Resources.Designer.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Properties/Resources.resx
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ResourceTypeRegistry.cs
Log:
#1621: Flesh out the symbol definition resource model. This is required for us to actually create simple and compound symbol definition objects from the ObjectFactory even though we are only using the generic XML editor for editing these objects.
Also apply [ToolboxItem(false)] to a whole bunch of controls
Modified: trunk/Tools/Maestro/ExtendedModels/SymbolDefinition-1.1.0/OSGeo.MapGuide.ObjectModels.SymbolDefinition-1.1.0.csproj
===================================================================
--- trunk/Tools/Maestro/ExtendedModels/SymbolDefinition-1.1.0/OSGeo.MapGuide.ObjectModels.SymbolDefinition-1.1.0.csproj 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/ExtendedModels/SymbolDefinition-1.1.0/OSGeo.MapGuide.ObjectModels.SymbolDefinition-1.1.0.csproj 2011-03-09 13:17:54 UTC (rev 5614)
@@ -21,7 +21,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\SDK\bin\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DefineConstants>TRACE;DEBUG;SYM_DEF_110</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
@@ -42,6 +42,12 @@
<Compile Include="..\..\Generated\SymbolDefinition-1.1.0.designer.cs">
<Link>SymbolDefinition-1.1.0.designer.cs</Link>
</Compile>
+ <Compile Include="..\..\OSGeo.MapGuide.MaestroAPI\ObjectModels\SymbolDefFactory.cs">
+ <Link>SymbolDefFactory.cs</Link>
+ </Compile>
+ <Compile Include="..\..\OSGeo.MapGuide.MaestroAPI\ObjectModels\SymbolDefinition.cs">
+ <Link>SymbolDefinition.cs</Link>
+ </Compile>
<Compile Include="..\..\Properties\GlobalAssemblyInfo.cs">
<Link>GlobalAssemblyInfo.cs</Link>
</Compile>
Modified: trunk/Tools/Maestro/Generated/SymbolDefinition-1.0.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/SymbolDefinition-1.0.0.designer.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Generated/SymbolDefinition-1.0.0.designer.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -5,7 +5,7 @@
// <NameSpace>OSGeo.MapGuide.ObjectModels.SymbolDefinition</NameSpace><Collection>BindingList</Collection><codeType>CSharp</codeType><EnableDataBinding>True</EnableDataBinding><EnableLasyLoading>False</EnableLasyLoading><HidePrivateFieldInIDE>True</HidePrivateFieldInIDE><EnableSummaryComment>True</EnableSummaryComment><IncludeSerializeMethod>True</IncludeSerializeMethod><UseBaseClass>False</UseBaseClass><GenerateCloneMethod>True</GenerateCloneMethod><GenerateDataContracts>False</GenerateDataContracts><CodeBaseTag>Net20</CodeBaseTag><SerializeMethodName>Serialize</SerializeMethodName><DeserializeMethodName>Deserialize</DeserializeMethodName><SaveToFileMethodName>SaveToFile</SaveToFileMethodName><LoadFromFileMethodName>LoadFromFile</LoadFromFileMethodName><GenerateXMLAttributes>True</GenerateXMLAttributes><AutomaticProperties>False</AutomaticProperties><DisableDebug>False</DisableDebug><CustomUsings></CustomUsings><ExcludeIncludedTypes>False</ExcludeIncludedTypes><EnableIni
tializeFields>False</EnableInitializeFields>
// </auto-generated>
// ------------------------------------------------------------------------------
-namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition {
+namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_0_0 {
using System;
using System.Diagnostics;
using System.Xml.Serialization;
@@ -13,216 +13,8 @@
using System.Xml.Schema;
using System.ComponentModel;
using System.IO;
+ using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
-
- [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
- [System.SerializableAttribute()]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
- [System.Xml.Serialization.XmlRootAttribute("SimpleSymbolDefinition", Namespace="", IsNullable=false)]
- public partial class SimpleSymbolDefinition1 : SimpleSymbolDefinition, System.ComponentModel.INotifyPropertyChanged {
-
- [EditorBrowsable(EditorBrowsableState.Never)]
- private string versionField;
-
- private static System.Xml.Serialization.XmlSerializer serializer;
-
- public SimpleSymbolDefinition1() {
- this.versionField = "1.0.0";
- }
-
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public string version {
- get {
- return this.versionField;
- }
- set {
- if ((this.versionField != null)) {
- if ((versionField.Equals(value) != true)) {
- this.versionField = value;
- this.OnPropertyChanged("version");
- }
- }
- else {
- this.versionField = value;
- this.OnPropertyChanged("version");
- }
- }
- }
-
- private static System.Xml.Serialization.XmlSerializer Serializer {
- get {
- if ((serializer == null)) {
- serializer = new System.Xml.Serialization.XmlSerializer(typeof(SimpleSymbolDefinition1));
- }
- return serializer;
- }
- }
-
- //public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-
- //public virtual void OnPropertyChanged(string info) {
- // System.ComponentModel.PropertyChangedEventHandler handler = this.PropertyChanged;
- // if ((handler != null)) {
- // handler(this, new System.ComponentModel.PropertyChangedEventArgs(info));
- // }
- //}
-
- #region Serialize/Deserialize
- /// <summary>
- /// Serializes current SimpleSymbolDefinition1 object into an XML document
- /// </summary>
- /// <returns>string XML value</returns>
- public virtual string Serialize() {
- System.IO.StreamReader streamReader = null;
- System.IO.MemoryStream memoryStream = null;
- try {
- memoryStream = new System.IO.MemoryStream();
- Serializer.Serialize(memoryStream, this);
- memoryStream.Seek(0, System.IO.SeekOrigin.Begin);
- streamReader = new System.IO.StreamReader(memoryStream);
- return streamReader.ReadToEnd();
- }
- finally {
- if ((streamReader != null)) {
- streamReader.Dispose();
- }
- if ((memoryStream != null)) {
- memoryStream.Dispose();
- }
- }
- }
-
- /// <summary>
- /// Deserializes workflow markup into an SimpleSymbolDefinition1 object
- /// </summary>
- /// <param name="xml">string workflow markup to deserialize</param>
- /// <param name="obj">Output SimpleSymbolDefinition1 object</param>
- /// <param name="exception">output Exception value if deserialize failed</param>
- /// <returns>true if this XmlSerializer can deserialize the object; otherwise, false</returns>
- public static bool Deserialize(string xml, out SimpleSymbolDefinition1 obj, out System.Exception exception) {
- exception = null;
- obj = default(SimpleSymbolDefinition1);
- try {
- obj = Deserialize(xml);
- return true;
- }
- catch (System.Exception ex) {
- exception = ex;
- return false;
- }
- }
-
- public static bool Deserialize(string xml, out SimpleSymbolDefinition1 obj) {
- System.Exception exception = null;
- return Deserialize(xml, out obj, out exception);
- }
-
- public static SimpleSymbolDefinition1 Deserialize(string xml) {
- System.IO.StringReader stringReader = null;
- try {
- stringReader = new System.IO.StringReader(xml);
- return ((SimpleSymbolDefinition1)(Serializer.Deserialize(System.Xml.XmlReader.Create(stringReader))));
- }
- finally {
- if ((stringReader != null)) {
- stringReader.Dispose();
- }
- }
- }
-
- /// <summary>
- /// Serializes current SimpleSymbolDefinition1 object into file
- /// </summary>
- /// <param name="fileName">full path of outupt xml file</param>
- /// <param name="exception">output Exception value if failed</param>
- /// <returns>true if can serialize and save into file; otherwise, false</returns>
- public virtual bool SaveToFile(string fileName, out System.Exception exception) {
- exception = null;
- try {
- SaveToFile(fileName);
- return true;
- }
- catch (System.Exception e) {
- exception = e;
- return false;
- }
- }
-
- public virtual void SaveToFile(string fileName) {
- System.IO.StreamWriter streamWriter = null;
- try {
- string xmlString = Serialize();
- System.IO.FileInfo xmlFile = new System.IO.FileInfo(fileName);
- streamWriter = xmlFile.CreateText();
- streamWriter.WriteLine(xmlString);
- streamWriter.Close();
- }
- finally {
- if ((streamWriter != null)) {
- streamWriter.Dispose();
- }
- }
- }
-
- /// <summary>
- /// Deserializes xml markup from file into an SimpleSymbolDefinition1 object
- /// </summary>
- /// <param name="fileName">string xml file to load and deserialize</param>
- /// <param name="obj">Output SimpleSymbolDefinition1 object</param>
- /// <param name="exception">output Exception value if deserialize failed</param>
- /// <returns>true if this XmlSerializer can deserialize the object; otherwise, false</returns>
- public static bool LoadFromFile(string fileName, out SimpleSymbolDefinition1 obj, out System.Exception exception) {
- exception = null;
- obj = default(SimpleSymbolDefinition1);
- try {
- obj = LoadFromFile(fileName);
- return true;
- }
- catch (System.Exception ex) {
- exception = ex;
- return false;
- }
- }
-
- public static bool LoadFromFile(string fileName, out SimpleSymbolDefinition1 obj) {
- System.Exception exception = null;
- return LoadFromFile(fileName, out obj, out exception);
- }
-
- public static SimpleSymbolDefinition1 LoadFromFile(string fileName) {
- System.IO.FileStream file = null;
- System.IO.StreamReader sr = null;
- try {
- file = new System.IO.FileStream(fileName, FileMode.Open, FileAccess.Read);
- sr = new System.IO.StreamReader(file);
- string xmlString = sr.ReadToEnd();
- sr.Close();
- file.Close();
- return Deserialize(xmlString);
- }
- finally {
- if ((file != null)) {
- file.Dispose();
- }
- if ((sr != null)) {
- sr.Dispose();
- }
- }
- }
- #endregion
-
- #region Clone method
- /// <summary>
- /// Create a clone of this SimpleSymbolDefinition1 object
- /// </summary>
- public virtual SimpleSymbolDefinition1 Clone() {
- return ((SimpleSymbolDefinition1)(this.MemberwiseClone()));
- }
- #endregion
- }
-
/// <summary>
/// A 2D simple symbol for stylization.
/// </summary>
@@ -254,6 +46,32 @@
[EditorBrowsable(EditorBrowsableState.Never)]
private ExtendedDataType extendedData1Field;
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ private string versionField;
+
+ public SimpleSymbolDefinition() {
+ this.versionField = "1.0.0";
+ }
+
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public string version {
+ get {
+ return this.versionField;
+ }
+ set {
+ if ((this.versionField != null)) {
+ if ((versionField.Equals(value) != true)) {
+ this.versionField = value;
+ this.OnPropertyChanged("version");
+ }
+ }
+ else {
+ this.versionField = value;
+ this.OnPropertyChanged("version");
+ }
+ }
+ }
+
private static System.Xml.Serialization.XmlSerializer serializer;
/// <summary>
@@ -5462,6 +5280,32 @@
[EditorBrowsable(EditorBrowsableState.Never)]
private ExtendedDataType extendedData1Field;
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ private string versionField;
+
+ public CompoundSymbolDefinition() {
+ this.versionField = "1.0.0";
+ }
+
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public string version {
+ get {
+ return this.versionField;
+ }
+ set {
+ if ((this.versionField != null)) {
+ if ((versionField.Equals(value) != true)) {
+ this.versionField = value;
+ this.OnPropertyChanged("version");
+ }
+ }
+ else {
+ this.versionField = value;
+ this.OnPropertyChanged("version");
+ }
+ }
+ }
+
private static System.Xml.Serialization.XmlSerializer serializer;
[System.Xml.Serialization.XmlElementAttribute("SimpleSymbol")]
@@ -5673,214 +5517,6 @@
#endregion
}
- [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
- [System.SerializableAttribute()]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
- [System.Xml.Serialization.XmlRootAttribute("CompoundSymbolDefinition", Namespace="", IsNullable=false)]
- public partial class CompoundSymbolDefinition1 : CompoundSymbolDefinition, System.ComponentModel.INotifyPropertyChanged {
-
- [EditorBrowsable(EditorBrowsableState.Never)]
- private string versionField;
-
- private static System.Xml.Serialization.XmlSerializer serializer;
-
- public CompoundSymbolDefinition1() {
- this.versionField = "1.0.0";
- }
-
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public string version {
- get {
- return this.versionField;
- }
- set {
- if ((this.versionField != null)) {
- if ((versionField.Equals(value) != true)) {
- this.versionField = value;
- this.OnPropertyChanged("version");
- }
- }
- else {
- this.versionField = value;
- this.OnPropertyChanged("version");
- }
- }
- }
-
- private static System.Xml.Serialization.XmlSerializer Serializer {
- get {
- if ((serializer == null)) {
- serializer = new System.Xml.Serialization.XmlSerializer(typeof(CompoundSymbolDefinition1));
- }
- return serializer;
- }
- }
-
- //public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-
- //public virtual void OnPropertyChanged(string info) {
- // System.ComponentModel.PropertyChangedEventHandler handler = this.PropertyChanged;
- // if ((handler != null)) {
- // handler(this, new System.ComponentModel.PropertyChangedEventArgs(info));
- // }
- //}
-
- #region Serialize/Deserialize
- /// <summary>
- /// Serializes current CompoundSymbolDefinition1 object into an XML document
- /// </summary>
- /// <returns>string XML value</returns>
- public virtual string Serialize() {
- System.IO.StreamReader streamReader = null;
- System.IO.MemoryStream memoryStream = null;
- try {
- memoryStream = new System.IO.MemoryStream();
- Serializer.Serialize(memoryStream, this);
- memoryStream.Seek(0, System.IO.SeekOrigin.Begin);
- streamReader = new System.IO.StreamReader(memoryStream);
- return streamReader.ReadToEnd();
- }
- finally {
- if ((streamReader != null)) {
- streamReader.Dispose();
- }
- if ((memoryStream != null)) {
- memoryStream.Dispose();
- }
- }
- }
-
- /// <summary>
- /// Deserializes workflow markup into an CompoundSymbolDefinition1 object
- /// </summary>
- /// <param name="xml">string workflow markup to deserialize</param>
- /// <param name="obj">Output CompoundSymbolDefinition1 object</param>
- /// <param name="exception">output Exception value if deserialize failed</param>
- /// <returns>true if this XmlSerializer can deserialize the object; otherwise, false</returns>
- public static bool Deserialize(string xml, out CompoundSymbolDefinition1 obj, out System.Exception exception) {
- exception = null;
- obj = default(CompoundSymbolDefinition1);
- try {
- obj = Deserialize(xml);
- return true;
- }
- catch (System.Exception ex) {
- exception = ex;
- return false;
- }
- }
-
- public static bool Deserialize(string xml, out CompoundSymbolDefinition1 obj) {
- System.Exception exception = null;
- return Deserialize(xml, out obj, out exception);
- }
-
- public static CompoundSymbolDefinition1 Deserialize(string xml) {
- System.IO.StringReader stringReader = null;
- try {
- stringReader = new System.IO.StringReader(xml);
- return ((CompoundSymbolDefinition1)(Serializer.Deserialize(System.Xml.XmlReader.Create(stringReader))));
- }
- finally {
- if ((stringReader != null)) {
- stringReader.Dispose();
- }
- }
- }
-
- /// <summary>
- /// Serializes current CompoundSymbolDefinition1 object into file
- /// </summary>
- /// <param name="fileName">full path of outupt xml file</param>
- /// <param name="exception">output Exception value if failed</param>
- /// <returns>true if can serialize and save into file; otherwise, false</returns>
- public virtual bool SaveToFile(string fileName, out System.Exception exception) {
- exception = null;
- try {
- SaveToFile(fileName);
- return true;
- }
- catch (System.Exception e) {
- exception = e;
- return false;
- }
- }
-
- public virtual void SaveToFile(string fileName) {
- System.IO.StreamWriter streamWriter = null;
- try {
- string xmlString = Serialize();
- System.IO.FileInfo xmlFile = new System.IO.FileInfo(fileName);
- streamWriter = xmlFile.CreateText();
- streamWriter.WriteLine(xmlString);
- streamWriter.Close();
- }
- finally {
- if ((streamWriter != null)) {
- streamWriter.Dispose();
- }
- }
- }
-
- /// <summary>
- /// Deserializes xml markup from file into an CompoundSymbolDefinition1 object
- /// </summary>
- /// <param name="fileName">string xml file to load and deserialize</param>
- /// <param name="obj">Output CompoundSymbolDefinition1 object</param>
- /// <param name="exception">output Exception value if deserialize failed</param>
- /// <returns>true if this XmlSerializer can deserialize the object; otherwise, false</returns>
- public static bool LoadFromFile(string fileName, out CompoundSymbolDefinition1 obj, out System.Exception exception) {
- exception = null;
- obj = default(CompoundSymbolDefinition1);
- try {
- obj = LoadFromFile(fileName);
- return true;
- }
- catch (System.Exception ex) {
- exception = ex;
- return false;
- }
- }
-
- public static bool LoadFromFile(string fileName, out CompoundSymbolDefinition1 obj) {
- System.Exception exception = null;
- return LoadFromFile(fileName, out obj, out exception);
- }
-
- public static CompoundSymbolDefinition1 LoadFromFile(string fileName) {
- System.IO.FileStream file = null;
- System.IO.StreamReader sr = null;
- try {
- file = new System.IO.FileStream(fileName, FileMode.Open, FileAccess.Read);
- sr = new System.IO.StreamReader(file);
- string xmlString = sr.ReadToEnd();
- sr.Close();
- file.Close();
- return Deserialize(xmlString);
- }
- finally {
- if ((file != null)) {
- file.Dispose();
- }
- if ((sr != null)) {
- sr.Dispose();
- }
- }
- }
- #endregion
-
- #region Clone method
- /// <summary>
- /// Create a clone of this CompoundSymbolDefinition1 object
- /// </summary>
- public virtual CompoundSymbolDefinition1 Clone() {
- return ((CompoundSymbolDefinition1)(this.MemberwiseClone()));
- }
- #endregion
- }
-
/// <summary>
/// The collection of graphic elements defining this symbol.
/// </summary>
Modified: trunk/Tools/Maestro/Generated/SymbolDefinition-1.1.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/SymbolDefinition-1.1.0.designer.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Generated/SymbolDefinition-1.1.0.designer.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -15,214 +15,6 @@
using System.IO;
using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
- [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
- [System.SerializableAttribute()]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
- [System.Xml.Serialization.XmlRootAttribute("SimpleSymbolDefinition", Namespace="", IsNullable=false)]
- public partial class SimpleSymbolDefinition1 : SimpleSymbolDefinition, System.ComponentModel.INotifyPropertyChanged {
-
- [EditorBrowsable(EditorBrowsableState.Never)]
- private string versionField;
-
- private static System.Xml.Serialization.XmlSerializer serializer;
-
- public SimpleSymbolDefinition1() {
- this.versionField = "1.1.0";
- }
-
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public string version {
- get {
- return this.versionField;
- }
- set {
- if ((this.versionField != null)) {
- if ((versionField.Equals(value) != true)) {
- this.versionField = value;
- this.OnPropertyChanged("version");
- }
- }
- else {
- this.versionField = value;
- this.OnPropertyChanged("version");
- }
- }
- }
-
- private static System.Xml.Serialization.XmlSerializer Serializer {
- get {
- if ((serializer == null)) {
- serializer = new System.Xml.Serialization.XmlSerializer(typeof(SimpleSymbolDefinition1));
- }
- return serializer;
- }
- }
-
- public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-
- public virtual void OnPropertyChanged(string info) {
- System.ComponentModel.PropertyChangedEventHandler handler = this.PropertyChanged;
- if ((handler != null)) {
- handler(this, new System.ComponentModel.PropertyChangedEventArgs(info));
- }
- }
-
- #region Serialize/Deserialize
- /// <summary>
- /// Serializes current SimpleSymbolDefinition1 object into an XML document
- /// </summary>
- /// <returns>string XML value</returns>
- public virtual string Serialize() {
- System.IO.StreamReader streamReader = null;
- System.IO.MemoryStream memoryStream = null;
- try {
- memoryStream = new System.IO.MemoryStream();
- Serializer.Serialize(memoryStream, this);
- memoryStream.Seek(0, System.IO.SeekOrigin.Begin);
- streamReader = new System.IO.StreamReader(memoryStream);
- return streamReader.ReadToEnd();
- }
- finally {
- if ((streamReader != null)) {
- streamReader.Dispose();
- }
- if ((memoryStream != null)) {
- memoryStream.Dispose();
- }
- }
- }
-
- /// <summary>
- /// Deserializes workflow markup into an SimpleSymbolDefinition1 object
- /// </summary>
- /// <param name="xml">string workflow markup to deserialize</param>
- /// <param name="obj">Output SimpleSymbolDefinition1 object</param>
- /// <param name="exception">output Exception value if deserialize failed</param>
- /// <returns>true if this XmlSerializer can deserialize the object; otherwise, false</returns>
- public static bool Deserialize(string xml, out SimpleSymbolDefinition1 obj, out System.Exception exception) {
- exception = null;
- obj = default(SimpleSymbolDefinition1);
- try {
- obj = Deserialize(xml);
- return true;
- }
- catch (System.Exception ex) {
- exception = ex;
- return false;
- }
- }
-
- public static bool Deserialize(string xml, out SimpleSymbolDefinition1 obj) {
- System.Exception exception = null;
- return Deserialize(xml, out obj, out exception);
- }
-
- public static SimpleSymbolDefinition1 Deserialize(string xml) {
- System.IO.StringReader stringReader = null;
- try {
- stringReader = new System.IO.StringReader(xml);
- return ((SimpleSymbolDefinition1)(Serializer.Deserialize(System.Xml.XmlReader.Create(stringReader))));
- }
- finally {
- if ((stringReader != null)) {
- stringReader.Dispose();
- }
- }
- }
-
- /// <summary>
- /// Serializes current SimpleSymbolDefinition1 object into file
- /// </summary>
- /// <param name="fileName">full path of outupt xml file</param>
- /// <param name="exception">output Exception value if failed</param>
- /// <returns>true if can serialize and save into file; otherwise, false</returns>
- public virtual bool SaveToFile(string fileName, out System.Exception exception) {
- exception = null;
- try {
- SaveToFile(fileName);
- return true;
- }
- catch (System.Exception e) {
- exception = e;
- return false;
- }
- }
-
- public virtual void SaveToFile(string fileName) {
- System.IO.StreamWriter streamWriter = null;
- try {
- string xmlString = Serialize();
- System.IO.FileInfo xmlFile = new System.IO.FileInfo(fileName);
- streamWriter = xmlFile.CreateText();
- streamWriter.WriteLine(xmlString);
- streamWriter.Close();
- }
- finally {
- if ((streamWriter != null)) {
- streamWriter.Dispose();
- }
- }
- }
-
- /// <summary>
- /// Deserializes xml markup from file into an SimpleSymbolDefinition1 object
- /// </summary>
- /// <param name="fileName">string xml file to load and deserialize</param>
- /// <param name="obj">Output SimpleSymbolDefinition1 object</param>
- /// <param name="exception">output Exception value if deserialize failed</param>
- /// <returns>true if this XmlSerializer can deserialize the object; otherwise, false</returns>
- public static bool LoadFromFile(string fileName, out SimpleSymbolDefinition1 obj, out System.Exception exception) {
- exception = null;
- obj = default(SimpleSymbolDefinition1);
- try {
- obj = LoadFromFile(fileName);
- return true;
- }
- catch (System.Exception ex) {
- exception = ex;
- return false;
- }
- }
-
- public static bool LoadFromFile(string fileName, out SimpleSymbolDefinition1 obj) {
- System.Exception exception = null;
- return LoadFromFile(fileName, out obj, out exception);
- }
-
- public static SimpleSymbolDefinition1 LoadFromFile(string fileName) {
- System.IO.FileStream file = null;
- System.IO.StreamReader sr = null;
- try {
- file = new System.IO.FileStream(fileName, FileMode.Open, FileAccess.Read);
- sr = new System.IO.StreamReader(file);
- string xmlString = sr.ReadToEnd();
- sr.Close();
- file.Close();
- return Deserialize(xmlString);
- }
- finally {
- if ((file != null)) {
- file.Dispose();
- }
- if ((sr != null)) {
- sr.Dispose();
- }
- }
- }
- #endregion
-
- #region Clone method
- /// <summary>
- /// Create a clone of this SimpleSymbolDefinition1 object
- /// </summary>
- public virtual SimpleSymbolDefinition1 Clone() {
- return ((SimpleSymbolDefinition1)(this.MemberwiseClone()));
- }
- #endregion
- }
-
/// <summary>
/// A 2D simple symbol for stylization.
/// </summary>
@@ -254,6 +46,32 @@
[EditorBrowsable(EditorBrowsableState.Never)]
private ExtendedDataType extendedData1Field;
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ private string versionField;
+
+ public SimpleSymbolDefinition() {
+ this.versionField = "1.1.0";
+ }
+
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public string version {
+ get {
+ return this.versionField;
+ }
+ set {
+ if ((this.versionField != null)) {
+ if ((versionField.Equals(value) != true)) {
+ this.versionField = value;
+ this.OnPropertyChanged("version");
+ }
+ }
+ else {
+ this.versionField = value;
+ this.OnPropertyChanged("version");
+ }
+ }
+ }
+
private static System.Xml.Serialization.XmlSerializer serializer;
/// <summary>
@@ -1638,7 +1456,7 @@
private string descriptionField;
[EditorBrowsable(EditorBrowsableState.Never)]
- private DataType dataTypeField;
+ private DataType2 dataTypeField;
[EditorBrowsable(EditorBrowsableState.Never)]
private ExtendedDataType extendedData1Field;
@@ -1646,7 +1464,7 @@
private static System.Xml.Serialization.XmlSerializer serializer;
public Parameter() {
- this.dataTypeField = DataType.String;
+ this.dataTypeField = DataType2.String;
}
/// <summary>
@@ -1736,8 +1554,8 @@
/// <summary>
/// An optional explicit declaration of data type or data usage context. This is a hint used by the UI when assigning a value to this parameter. Defaults to String.
/// </summary>
- [System.ComponentModel.DefaultValueAttribute(DataType.String)]
- public DataType DataType {
+ [System.ComponentModel.DefaultValueAttribute(DataType2.String)]
+ public DataType2 DataType {
get {
return this.dataTypeField;
}
@@ -5549,6 +5367,32 @@
[EditorBrowsable(EditorBrowsableState.Never)]
private ExtendedDataType extendedData1Field;
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ private string versionField;
+
+ public CompoundSymbolDefinition() {
+ this.versionField = "1.1.0";
+ }
+
+ [System.Xml.Serialization.XmlAttributeAttribute()]
+ public string version {
+ get {
+ return this.versionField;
+ }
+ set {
+ if ((this.versionField != null)) {
+ if ((versionField.Equals(value) != true)) {
+ this.versionField = value;
+ this.OnPropertyChanged("version");
+ }
+ }
+ else {
+ this.versionField = value;
+ this.OnPropertyChanged("version");
+ }
+ }
+ }
+
private static System.Xml.Serialization.XmlSerializer serializer;
[System.Xml.Serialization.XmlElementAttribute("SimpleSymbol")]
@@ -5760,214 +5604,6 @@
#endregion
}
- [System.CodeDom.Compiler.GeneratedCodeAttribute("Xsd2Code", "3.3.0.33572")]
- [System.SerializableAttribute()]
- [System.Diagnostics.DebuggerStepThroughAttribute()]
- [System.ComponentModel.DesignerCategoryAttribute("code")]
- [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
- [System.Xml.Serialization.XmlRootAttribute("CompoundSymbolDefinition", Namespace="", IsNullable=false)]
- public partial class CompoundSymbolDefinition1 : CompoundSymbolDefinition, System.ComponentModel.INotifyPropertyChanged {
-
- [EditorBrowsable(EditorBrowsableState.Never)]
- private string versionField;
-
- private static System.Xml.Serialization.XmlSerializer serializer;
-
- public CompoundSymbolDefinition1() {
- this.versionField = "1.1.0";
- }
-
- [System.Xml.Serialization.XmlAttributeAttribute()]
- public string version {
- get {
- return this.versionField;
- }
- set {
- if ((this.versionField != null)) {
- if ((versionField.Equals(value) != true)) {
- this.versionField = value;
- this.OnPropertyChanged("version");
- }
- }
- else {
- this.versionField = value;
- this.OnPropertyChanged("version");
- }
- }
- }
-
- private static System.Xml.Serialization.XmlSerializer Serializer {
- get {
- if ((serializer == null)) {
- serializer = new System.Xml.Serialization.XmlSerializer(typeof(CompoundSymbolDefinition1));
- }
- return serializer;
- }
- }
-
- public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-
- public virtual void OnPropertyChanged(string info) {
- System.ComponentModel.PropertyChangedEventHandler handler = this.PropertyChanged;
- if ((handler != null)) {
- handler(this, new System.ComponentModel.PropertyChangedEventArgs(info));
- }
- }
-
- #region Serialize/Deserialize
- /// <summary>
- /// Serializes current CompoundSymbolDefinition1 object into an XML document
- /// </summary>
- /// <returns>string XML value</returns>
- public virtual string Serialize() {
- System.IO.StreamReader streamReader = null;
- System.IO.MemoryStream memoryStream = null;
- try {
- memoryStream = new System.IO.MemoryStream();
- Serializer.Serialize(memoryStream, this);
- memoryStream.Seek(0, System.IO.SeekOrigin.Begin);
- streamReader = new System.IO.StreamReader(memoryStream);
- return streamReader.ReadToEnd();
- }
- finally {
- if ((streamReader != null)) {
- streamReader.Dispose();
- }
- if ((memoryStream != null)) {
- memoryStream.Dispose();
- }
- }
- }
-
- /// <summary>
- /// Deserializes workflow markup into an CompoundSymbolDefinition1 object
- /// </summary>
- /// <param name="xml">string workflow markup to deserialize</param>
- /// <param name="obj">Output CompoundSymbolDefinition1 object</param>
- /// <param name="exception">output Exception value if deserialize failed</param>
- /// <returns>true if this XmlSerializer can deserialize the object; otherwise, false</returns>
- public static bool Deserialize(string xml, out CompoundSymbolDefinition1 obj, out System.Exception exception) {
- exception = null;
- obj = default(CompoundSymbolDefinition1);
- try {
- obj = Deserialize(xml);
- return true;
- }
- catch (System.Exception ex) {
- exception = ex;
- return false;
- }
- }
-
- public static bool Deserialize(string xml, out CompoundSymbolDefinition1 obj) {
- System.Exception exception = null;
- return Deserialize(xml, out obj, out exception);
- }
-
- public static CompoundSymbolDefinition1 Deserialize(string xml) {
- System.IO.StringReader stringReader = null;
- try {
- stringReader = new System.IO.StringReader(xml);
- return ((CompoundSymbolDefinition1)(Serializer.Deserialize(System.Xml.XmlReader.Create(stringReader))));
- }
- finally {
- if ((stringReader != null)) {
- stringReader.Dispose();
- }
- }
- }
-
- /// <summary>
- /// Serializes current CompoundSymbolDefinition1 object into file
- /// </summary>
- /// <param name="fileName">full path of outupt xml file</param>
- /// <param name="exception">output Exception value if failed</param>
- /// <returns>true if can serialize and save into file; otherwise, false</returns>
- public virtual bool SaveToFile(string fileName, out System.Exception exception) {
- exception = null;
- try {
- SaveToFile(fileName);
- return true;
- }
- catch (System.Exception e) {
- exception = e;
- return false;
- }
- }
-
- public virtual void SaveToFile(string fileName) {
- System.IO.StreamWriter streamWriter = null;
- try {
- string xmlString = Serialize();
- System.IO.FileInfo xmlFile = new System.IO.FileInfo(fileName);
- streamWriter = xmlFile.CreateText();
- streamWriter.WriteLine(xmlString);
- streamWriter.Close();
- }
- finally {
- if ((streamWriter != null)) {
- streamWriter.Dispose();
- }
- }
- }
-
- /// <summary>
- /// Deserializes xml markup from file into an CompoundSymbolDefinition1 object
- /// </summary>
- /// <param name="fileName">string xml file to load and deserialize</param>
- /// <param name="obj">Output CompoundSymbolDefinition1 object</param>
- /// <param name="exception">output Exception value if deserialize failed</param>
- /// <returns>true if this XmlSerializer can deserialize the object; otherwise, false</returns>
- public static bool LoadFromFile(string fileName, out CompoundSymbolDefinition1 obj, out System.Exception exception) {
- exception = null;
- obj = default(CompoundSymbolDefinition1);
- try {
- obj = LoadFromFile(fileName);
- return true;
- }
- catch (System.Exception ex) {
- exception = ex;
- return false;
- }
- }
-
- public static bool LoadFromFile(string fileName, out CompoundSymbolDefinition1 obj) {
- System.Exception exception = null;
- return LoadFromFile(fileName, out obj, out exception);
- }
-
- public static CompoundSymbolDefinition1 LoadFromFile(string fileName) {
- System.IO.FileStream file = null;
- System.IO.StreamReader sr = null;
- try {
- file = new System.IO.FileStream(fileName, FileMode.Open, FileAccess.Read);
- sr = new System.IO.StreamReader(file);
- string xmlString = sr.ReadToEnd();
- sr.Close();
- file.Close();
- return Deserialize(xmlString);
- }
- finally {
- if ((file != null)) {
- file.Dispose();
- }
- if ((sr != null)) {
- sr.Dispose();
- }
- }
- }
- #endregion
-
- #region Clone method
- /// <summary>
- /// Create a clone of this CompoundSymbolDefinition1 object
- /// </summary>
- public virtual CompoundSymbolDefinition1 Clone() {
- return ((CompoundSymbolDefinition1)(this.MemberwiseClone()));
- }
- #endregion
- }
-
/// <summary>
/// The collection of graphic elements defining this symbol.
/// </summary>
Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Commands/StartupCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Commands/StartupCommand.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Commands/StartupCommand.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -32,6 +32,9 @@
using Lp110 = OSGeo.MapGuide.ObjectModels.LoadProcedure_1_1_0;
using Lp220 = OSGeo.MapGuide.ObjectModels.LoadProcedure_2_2_0;
using WL110 = OSGeo.MapGuide.ObjectModels.WebLayout_1_1_0;
+
+using Sym110 = OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_1_0;
+
using OSGeo.MapGuide.ObjectModels.LoadProcedure;
using OSGeo.MapGuide.MaestroAPI.Resource.Validation;
using OSGeo.MapGuide.ObjectModels;
@@ -98,6 +101,13 @@
new ResourceDeserializationCallback(WL110.WebLayoutEntryPoint.Deserialize));
ObjectFactory.RegisterWebLayoutFactoryMethod(new Version(1, 1, 0), new WebLayoutCreatorFunc(WL110.WebLayoutEntryPoint.CreateDefault));
+ //Symbol Definition 1.1.0
+ ResourceTypeRegistry.RegisterResource(
+ new ResourceTypeDescriptor(ResourceTypes.SymbolDefinition, "1.1.0"),
+ new ResourceSerializationCallback(Sym110.SymbolDefEntryPoint.Serialize),
+ new ResourceDeserializationCallback(Sym110.SymbolDefEntryPoint.Deserialize));
+ ObjectFactory.RegisterCompoundSymbolFactoryMethod(new Version(1, 1, 0), new CompoundSymbolDefCreatorFunc(Sym110.SymbolDefEntryPoint.CreateDefaultCompound));
+ ObjectFactory.RegisterSimpleSymbolFactoryMethod(new Version(1, 1, 0), new SimpleSymbolDefCreatorFunc(Sym110.SymbolDefEntryPoint.CreateDefaultSimple));
}
}
}
Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Maestro.AddIn.ExtendedObjectModels.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Maestro.AddIn.ExtendedObjectModels.csproj 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Maestro.AddIn.ExtendedObjectModels.csproj 2011-03-09 13:17:54 UTC (rev 5614)
@@ -102,6 +102,7 @@
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Templates\SQLiteLoadProcedureItemTemplate.cs" />
+ <Compile Include="Templates\SymbolDefinition110ItemTemplate.cs" />
<Compile Include="Templates\VectorLayer130ItemTemplate.cs" />
<Compile Include="Templates\VectorLayer120ItemTemplate.cs" />
<Compile Include="Templates\VectorLayer110ItemTemplate.cs" />
Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Properties/Resources.Designer.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Properties/Resources.Designer.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -74,6 +74,24 @@
}
}
+ /// <summary>
+ /// Looks up a localized string similar to A description for this symbol.
+ /// </summary>
+ internal static string DefaultSymbolDescription {
+ get {
+ return ResourceManager.GetString("DefaultSymbolDescription", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to MySymbol.
+ /// </summary>
+ internal static string DefaultSymbolName {
+ get {
+ return ResourceManager.GetString("DefaultSymbolName", resourceCulture);
+ }
+ }
+
internal static System.Drawing.Bitmap document {
get {
object obj = ResourceManager.GetObject("document", resourceCulture);
@@ -148,6 +166,24 @@
}
/// <summary>
+ /// Looks up a localized string similar to Create a new Compund Symbol Definition using the v1.1.0 schema.
+ /// </summary>
+ internal static string TPL_CSD_DESC {
+ get {
+ return ResourceManager.GetString("TPL_CSD_DESC", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Compound Symbol Definition (v1.1.0).
+ /// </summary>
+ internal static string TPL_CSD_NAME {
+ get {
+ return ResourceManager.GetString("TPL_CSD_NAME", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Create a new SQLite Load Procedure.
/// </summary>
internal static string TPL_LP_SQLITE_DESC {
@@ -166,6 +202,24 @@
}
/// <summary>
+ /// Looks up a localized string similar to Create a new Simple Symbol Definition using the v1.1.0 schema.
+ /// </summary>
+ internal static string TPL_SSD_DESC {
+ get {
+ return ResourceManager.GetString("TPL_SSD_DESC", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Simple Symbol Definition (v1.1.0).
+ /// </summary>
+ internal static string TPL_SSD_NAME {
+ get {
+ return ResourceManager.GetString("TPL_SSD_NAME", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Create a new Vector Layer Definition using the v1.1.0 schema.
/// </summary>
internal static string TPL_VLDF_110_DESC {
Modified: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Properties/Resources.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Properties/Resources.resx 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Properties/Resources.resx 2011-03-09 13:17:54 UTC (rev 5614)
@@ -181,4 +181,22 @@
<data name="application_browser" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-browser.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="TPL_CSD_DESC" xml:space="preserve">
+ <value>Create a new Compund Symbol Definition using the v1.1.0 schema</value>
+ </data>
+ <data name="TPL_CSD_NAME" xml:space="preserve">
+ <value>Compound Symbol Definition (v1.1.0)</value>
+ </data>
+ <data name="TPL_SSD_DESC" xml:space="preserve">
+ <value>Create a new Simple Symbol Definition using the v1.1.0 schema</value>
+ </data>
+ <data name="TPL_SSD_NAME" xml:space="preserve">
+ <value>Simple Symbol Definition (v1.1.0)</value>
+ </data>
+ <data name="DefaultSymbolDescription" xml:space="preserve">
+ <value>A description for this symbol</value>
+ </data>
+ <data name="DefaultSymbolName" xml:space="preserve">
+ <value>MySymbol</value>
+ </data>
</root>
\ No newline at end of file
Copied: trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/SymbolDefinition110ItemTemplate.cs (from rev 5613, trunk/Tools/Maestro/Maestro.Base/Templates/SymbolDefinitionItemTemplate.cs)
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/SymbolDefinition110ItemTemplate.cs (rev 0)
+++ trunk/Tools/Maestro/Maestro.AddIn.ExtendedObjectModels/Templates/SymbolDefinition110ItemTemplate.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -0,0 +1,81 @@
+#region Disclaimer / License
+// Copyright (C) 2011, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+#endregion
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using Res = Maestro.AddIn.ExtendedObjectModels.Properties.Resources;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels;
+using Maestro.Base.Templates;
+
+namespace Maestro.AddIn.ExtendedObjectModels.Templates
+{
+ public class SimpleSymbolDefinitionItem110Template : ItemTemplate
+ {
+ public SimpleSymbolDefinitionItem110Template()
+ {
+ Category = Res.TPL_CATEGORY_MGOS20;
+ Icon = Res.images_stack;
+ Description = Res.TPL_SSD_DESC;
+ Name = Res.TPL_SSD_NAME;
+ ResourceType = ResourceTypes.SymbolDefinition.ToString();
+ }
+
+ public override Version MinimumSiteVersion
+ {
+ get
+ {
+ return new Version(2, 0);
+ }
+ }
+
+ public override IResource CreateItem(IServerConnection conn)
+ {
+ return ObjectFactory.CreateSimpleSymbol(conn, new Version(1, 1, 0), Res.DefaultSymbolName, Res.DefaultSymbolDescription);
+ }
+ }
+
+ public class CompoundSymbolDefinition110ItemTemplate : ItemTemplate
+ {
+ public CompoundSymbolDefinition110ItemTemplate()
+ {
+ Category = Res.TPL_CATEGORY_MGOS20;
+ Icon = Res.images_stack;
+ Description = Res.TPL_CSD_DESC;
+ Name = Res.TPL_CSD_NAME;
+ ResourceType = ResourceTypes.SymbolDefinition.ToString();
+ }
+
+ public override Version MinimumSiteVersion
+ {
+ get
+ {
+ return new Version(2, 0);
+ }
+ }
+
+ public override IResource CreateItem(IServerConnection conn)
+ {
+ return ObjectFactory.CreateCompoundSymbol(conn, new Version(1, 1, 0), Res.DefaultSymbolName, Res.DefaultSymbolDescription);
+ }
+ }
+}
Modified: trunk/Tools/Maestro/Maestro.Base/Maestro.Base.addin
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Maestro.Base.addin 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Base/Maestro.Base.addin 2011-03-09 13:17:54 UTC (rev 5614)
@@ -47,7 +47,9 @@
<Class id="LoadProcedureEditor100" class="Maestro.Base.Editor.LoadProcedureEditorFactory" />
<Class id="MapDefinitionEditor100" class="Maestro.Base.Editor.MapDefinitionEditorFactory" />
<Class id="PrintLayoutEditor100" class="Maestro.Base.Editor.PrintLayoutEditorFactory" />
+ <!--
<Class id="SymbolDefinitionEditor100" class="Maestro.Base.Editor.SymbolDefinitionEditorFactory" />
+ -->
<Class id="WebLayoutEditor100" class="Maestro.Base.Editor.WebLayoutEditorFactory" />
</Path>
Modified: trunk/Tools/Maestro/Maestro.Base/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Properties/Resources.Designer.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Base/Properties/Resources.Designer.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -477,6 +477,24 @@
}
}
+ /// <summary>
+ /// Looks up a localized string similar to A description for this symbol.
+ /// </summary>
+ internal static string DefaultSymbolDescription {
+ get {
+ return ResourceManager.GetString("DefaultSymbolDescription", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to MySymbol.
+ /// </summary>
+ internal static string DefaultSymbolName {
+ get {
+ return ResourceManager.GetString("DefaultSymbolName", resourceCulture);
+ }
+ }
+
internal static System.Drawing.Bitmap disk {
get {
object obj = ResourceManager.GetObject("disk", resourceCulture);
@@ -1677,7 +1695,7 @@
}
/// <summary>
- /// Looks up a localized string similar to Create a new Compund Symbol Definition.
+ /// Looks up a localized string similar to Create a new Compund Symbol Definition using the v1.0.0 schema.
/// </summary>
internal static string TPL_CSD_DESC {
get {
@@ -1686,7 +1704,7 @@
}
/// <summary>
- /// Looks up a localized string similar to Compound Symbol Definition.
+ /// Looks up a localized string similar to Compound Symbol Definition (v1.0.0).
/// </summary>
internal static string TPL_CSD_NAME {
get {
@@ -1857,7 +1875,7 @@
}
/// <summary>
- /// Looks up a localized string similar to Create a new Simple Symbol Definition.
+ /// Looks up a localized string similar to Create a new Simple Symbol Definition using the v1.0.0 schema.
/// </summary>
internal static string TPL_SSD_DESC {
get {
@@ -1866,7 +1884,7 @@
}
/// <summary>
- /// Looks up a localized string similar to Simple Symbol Definition.
+ /// Looks up a localized string similar to Simple Symbol Definition (v1.0.0).
/// </summary>
internal static string TPL_SSD_NAME {
get {
Modified: trunk/Tools/Maestro/Maestro.Base/Properties/Resources.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Properties/Resources.resx 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Base/Properties/Resources.resx 2011-03-09 13:17:54 UTC (rev 5614)
@@ -449,10 +449,10 @@
<value>Print Layout</value>
</data>
<data name="TPL_SSD_DESC" xml:space="preserve">
- <value>Create a new Simple Symbol Definition</value>
+ <value>Create a new Simple Symbol Definition using the v1.0.0 schema</value>
</data>
<data name="TPL_SSD_NAME" xml:space="preserve">
- <value>Simple Symbol Definition</value>
+ <value>Simple Symbol Definition (v1.0.0)</value>
</data>
<data name="TPL_WL_DESC" xml:space="preserve">
<value>Create a new Web Layout using the v1.0.0 schema</value>
@@ -575,10 +575,10 @@
<value>User Defined Resource Template</value>
</data>
<data name="TPL_CSD_DESC" xml:space="preserve">
- <value>Create a new Compund Symbol Definition</value>
+ <value>Create a new Compund Symbol Definition using the v1.0.0 schema</value>
</data>
<data name="TPL_CSD_NAME" xml:space="preserve">
- <value>Compound Symbol Definition</value>
+ <value>Compound Symbol Definition (v1.0.0)</value>
</data>
<data name="ValidationBuildingList" xml:space="preserve">
<value>Building resource list...</value>
@@ -838,4 +838,10 @@
<data name="SiteExplorer_MigrateResources" xml:space="preserve">
<value>Migrate Resources</value>
</data>
+ <data name="DefaultSymbolDescription" xml:space="preserve">
+ <value>A description for this symbol</value>
+ </data>
+ <data name="DefaultSymbolName" xml:space="preserve">
+ <value>MySymbol</value>
+ </data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Base/Templates/SymbolDefinitionItemTemplate.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Templates/SymbolDefinitionItemTemplate.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Base/Templates/SymbolDefinitionItemTemplate.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -39,9 +39,17 @@
ResourceType = ResourceTypes.SymbolDefinition.ToString();
}
+ public override Version MinimumSiteVersion
+ {
+ get
+ {
+ return new Version(1, 2);
+ }
+ }
+
public override IResource CreateItem(IServerConnection conn)
{
- return ObjectFactory.CreateSimpleSymbol(conn);
+ return ObjectFactory.CreateSimpleSymbol(conn, new Version(1, 0, 0), Res.DefaultSymbolName, Res.DefaultSymbolDescription);
}
}
@@ -56,9 +64,17 @@
ResourceType = ResourceTypes.SymbolDefinition.ToString();
}
+ public override Version MinimumSiteVersion
+ {
+ get
+ {
+ return new Version(1, 2);
+ }
+ }
+
public override IResource CreateItem(IServerConnection conn)
{
- return ObjectFactory.CreateCompoundSymbol(conn);
+ return ObjectFactory.CreateCompoundSymbol(conn, new Version(1, 0, 0), Res.DefaultSymbolName, Res.DefaultSymbolDescription);
}
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Common/EditorBindableCollapsiblePanel.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/EditorBindableCollapsiblePanel.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/EditorBindableCollapsiblePanel.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -21,6 +21,7 @@
using System.Collections.Generic;
using System.Text;
using Maestro.Shared.UI;
+using System.ComponentModel;
namespace Maestro.Editors.Common
{
@@ -28,6 +29,7 @@
/// An extension of <see cref="CollapsiblePanel"/> with a default implementation of the
/// <see cref="IEditorBindable"/> interface
/// </summary>
+ [ToolboxItem(false)]
public class EditorBindableCollapsiblePanel : CollapsiblePanel, IEditorBindable
{
/// <summary>
Modified: trunk/Tools/Maestro/Maestro.Editors/DrawingSource/DrawingSourceEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/DrawingSource/DrawingSourceEditorCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/DrawingSource/DrawingSourceEditorCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -30,6 +30,7 @@
/// <summary>
/// Editor control for Drawing Sources
/// </summary>
+ [ToolboxItem(false)]
public partial class DrawingSourceEditorCtrl : EditorBase
{
/// <summary>
Modified: trunk/Tools/Maestro/Maestro.Editors/DrawingSource/SourceSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/DrawingSource/SourceSectionCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/DrawingSource/SourceSectionCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -32,7 +32,8 @@
namespace Maestro.Editors.DrawingSource
{
- [ToolboxItem(true)]
+ //[ToolboxItem(true)]
+ [ToolboxItem(false)]
internal partial class SourceSectionCtrl : EditorBindableCollapsiblePanel
{
public SourceSectionCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/EditorBase.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/EditorBase.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/EditorBase.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -22,9 +22,11 @@
using System.Text;
using System.Windows.Forms;
using OSGeo.MapGuide.MaestroAPI.Resource;
+using System.ComponentModel;
namespace Maestro.Editors
{
+ [ToolboxItem(false)]
/// <summary>
/// Base class of all resource editors
/// </summary>
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/CoordSysOverrideCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/CoordSysOverrideCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/CoordSysOverrideCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -33,6 +33,7 @@
namespace Maestro.Editors.FeatureSource
{
+ [ToolboxItem(false)]
internal partial class CoordSysOverrideCtrl : EditorBindableCollapsiblePanel
{
public CoordSysOverrideCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/CalculationSettings.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/CalculationSettings.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/CalculationSettings.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -31,6 +31,7 @@
namespace Maestro.Editors.FeatureSource.Extensions
{
+ [ToolboxItem(false)]
internal partial class CalculationSettings : UserControl
{
private CalculationSettings()
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/ExtendedClassSettings.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/ExtendedClassSettings.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/ExtendedClassSettings.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -31,6 +31,7 @@
namespace Maestro.Editors.FeatureSource.Extensions
{
+ [ToolboxItem(false)]
internal partial class ExtendedClassSettings : UserControl, IEditorBindable
{
private ExtendedClassSettings()
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/JoinSettings.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/JoinSettings.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Extensions/JoinSettings.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -33,6 +33,7 @@
namespace Maestro.Editors.FeatureSource.Extensions
{
+ [ToolboxItem(false)]
internal partial class JoinSettings : UserControl, IEditorBindable
{
private JoinSettings()
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/ExtensionsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/ExtensionsCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/ExtensionsCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -36,6 +36,7 @@
namespace Maestro.Editors.FeatureSource
{
+ [ToolboxItem(false)]
internal partial class ExtensionsCtrl : EditorBindableCollapsiblePanel
{
public ExtensionsCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/PreviewPane.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/PreviewPane.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/PreviewPane.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -34,7 +34,7 @@
namespace Maestro.Editors.FeatureSource.Preview
{
//TODO: IGeometry objects do not currently display (we should be showing the WKT form)
-
+ [ToolboxItem(false)]
internal partial class PreviewPane : UserControl, IQueryControl
{
private PreviewPane()
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/SqlQueryCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/SqlQueryCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/SqlQueryCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -29,6 +29,7 @@
namespace Maestro.Editors.FeatureSource.Preview
{
+ [ToolboxItem(false)]
internal partial class SqlQueryCtrl : UserControl, IQueryControl
{
private SqlQueryCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/StandardQueryCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/StandardQueryCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/StandardQueryCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -34,6 +34,7 @@
namespace Maestro.Editors.FeatureSource.Preview
{
+ [ToolboxItem(false)]
internal partial class StandardQueryCtrl : UserControl, IQueryControl
{
private StandardQueryCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/FileBasedCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/FileBasedCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/FileBasedCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -29,6 +29,7 @@
namespace Maestro.Editors.FeatureSource.Providers
{
+ [ToolboxItem(false)]
internal partial class FileBasedCtrl : EditorBindableCollapsiblePanel
{
public FileBasedCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -37,6 +37,7 @@
namespace Maestro.Editors.FeatureSource.Providers.Gdal
{
+ [ToolboxItem(false)]
internal partial class CompositeFileCtrl : EditorBase
{
internal CompositeFileCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/GdalProviderCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/GdalProviderCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/GdalProviderCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -29,7 +29,8 @@
namespace Maestro.Editors.FeatureSource.Providers.Gdal
{
- public partial class GdalProviderCtrl : EditorBindableCollapsiblePanel
+ [ToolboxItem(false)]
+ internal partial class GdalProviderCtrl : EditorBindableCollapsiblePanel
{
public GdalProviderCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/SingleFileCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/SingleFileCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/SingleFileCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -30,7 +30,8 @@
namespace Maestro.Editors.FeatureSource.Providers.Gdal
{
- public partial class SingleFileCtrl : EditorBase
+ [ToolboxItem(false)]
+ internal partial class SingleFileCtrl : EditorBase
{
public SingleFileCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/GenericCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/GenericCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/GenericCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -35,6 +35,7 @@
namespace Maestro.Editors.FeatureSource.Providers
{
+ [ToolboxItem(false)]
internal partial class GenericCtrl : EditorBindableCollapsiblePanel
{
internal GenericCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcProviderCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcProviderCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OdbcProviderCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -36,6 +36,7 @@
namespace Maestro.Editors.FeatureSource.Providers.Odbc
{
+ [ToolboxItem(false)]
internal partial class OdbcProviderCtrl : EditorBindableCollapsiblePanel
{
enum OdbcConnectionMethod
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableConfigCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableConfigCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableConfigCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -10,7 +10,8 @@
namespace Maestro.Editors.FeatureSource.Providers.Odbc.OverrideEditor
{
- public partial class TableConfigCtrl : UserControl
+ [ToolboxItem(false)]
+ internal partial class TableConfigCtrl : UserControl
{
public TableConfigCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableConfigurationDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableConfigurationDialog.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/OverrideEditor/TableConfigurationDialog.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -10,7 +10,7 @@
namespace Maestro.Editors.FeatureSource.Providers.Odbc.OverrideEditor
{
- public partial class TableConfigurationDialog : Form
+ internal partial class TableConfigurationDialog : Form
{
private BindingList<TableOverrideItem> _tables;
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/ConnectionStringCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/ConnectionStringCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/ConnectionStringCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -28,7 +28,8 @@
namespace Maestro.Editors.FeatureSource.Providers.Odbc.SubEditors
{
- public partial class ConnectionStringCtrl : EditorBase, IOdbcSubEditor
+ [ToolboxItem(false)]
+ internal partial class ConnectionStringCtrl : EditorBase, IOdbcSubEditor
{
public ConnectionStringCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/DSNCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/DSNCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/DSNCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -30,7 +30,8 @@
namespace Maestro.Editors.FeatureSource.Providers.Odbc.SubEditors
{
- public partial class DSNCtrl : EditorBase, IOdbcSubEditor
+ [ToolboxItem(false)]
+ internal partial class DSNCtrl : EditorBase, IOdbcSubEditor
{
public DSNCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/KnownDriversCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/KnownDriversCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/KnownDriversCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -28,7 +28,8 @@
namespace Maestro.Editors.FeatureSource.Providers.Odbc.SubEditors
{
- public partial class KnownDriversCtrl : EditorBase, IOdbcSubEditor
+ [ToolboxItem(false)]
+ internal partial class KnownDriversCtrl : EditorBase, IOdbcSubEditor
{
public KnownDriversCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/ManagedCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/ManagedCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/ManagedCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -29,7 +29,8 @@
namespace Maestro.Editors.FeatureSource.Providers.Odbc.SubEditors
{
- public partial class ManagedCtrl : EditorBase, IOdbcSubEditor
+ [ToolboxItem(false)]
+ internal partial class ManagedCtrl : EditorBase, IOdbcSubEditor
{
public ManagedCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -28,7 +28,8 @@
namespace Maestro.Editors.FeatureSource.Providers.Odbc.SubEditors
{
- public partial class UnmanagedCtrl : EditorBase, IOdbcSubEditor
+ [ToolboxItem(false)]
+ internal partial class UnmanagedCtrl : EditorBase, IOdbcSubEditor
{
public UnmanagedCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/MySqlCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/MySqlCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/MySqlCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -27,6 +27,7 @@
namespace Maestro.Editors.FeatureSource.Providers.Rdbms
{
+ [ToolboxItem(false)]
internal partial class MySqlCtrl : RdbmsBaseCtrl
{
public MySqlCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/PostgreSqlCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/PostgreSqlCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/PostgreSqlCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -27,6 +27,7 @@
namespace Maestro.Editors.FeatureSource.Providers.Rdbms
{
+ [ToolboxItem(false)]
internal partial class PostgreSqlCtrl : RdbmsBaseCtrl
{
public PostgreSqlCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -32,6 +32,7 @@
namespace Maestro.Editors.FeatureSource.Providers.Rdbms
{
+ [ToolboxItem(false)]
internal partial class RdbmsBaseCtrl : EditorBindableCollapsiblePanel
{
public RdbmsBaseCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/SqlServerSpatialCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/SqlServerSpatialCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/SqlServerSpatialCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -27,6 +27,7 @@
namespace Maestro.Editors.FeatureSource.Providers.Rdbms
{
+ [ToolboxItem(false)]
internal partial class SqlServerSpatialCtrl : RdbmsBaseCtrl
{
public SqlServerSpatialCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/SQLite/SQLiteFileCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/SQLite/SQLiteFileCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/SQLite/SQLiteFileCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -29,6 +29,7 @@
namespace Maestro.Editors.FeatureSource.Providers.SQLite
{
+ [ToolboxItem(false)]
internal partial class SQLiteFileCtrl : FileBasedCtrl
{
public SQLiteFileCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Sdf/SdfFileCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Sdf/SdfFileCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Sdf/SdfFileCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -29,6 +29,7 @@
namespace Maestro.Editors.FeatureSource.Providers.Sdf
{
+ [ToolboxItem(false)]
internal partial class SdfFileCtrl : FileBasedCtrl
{
public SdfFileCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Shp/ShpFileCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Shp/ShpFileCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Shp/ShpFileCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -30,6 +30,7 @@
namespace Maestro.Editors.FeatureSource.Providers.Shp
{
+ [ToolboxItem(false)]
internal partial class ShpFileCtrl : FileBasedCtrl
{
public ShpFileCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexLayoutSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexLayoutSettingsCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexLayoutSettingsCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -34,8 +34,9 @@
{
internal delegate void TemplateChangeEventHandler(IApplicationDefinitionTemplateInfo selectedTemplate);
- [ToolboxItem(true)]
- public partial class FlexLayoutSettingsCtrl : EditorBindableCollapsiblePanel
+ [ToolboxItem(false)]
+ //[ToolboxItem(true)]
+ internal partial class FlexLayoutSettingsCtrl : EditorBindableCollapsiblePanel
{
public FlexLayoutSettingsCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -35,7 +35,8 @@
namespace Maestro.Editors.Fusion
{
- public partial class MapCtrl : UserControl
+ [ToolboxItem(false)]
+ internal partial class MapCtrl : UserControl
{
const string G_NORMAL_MAP = "G_NORMAL_MAP";
const string G_SATELLITE_MAP = "G_SATELLITE_MAP";
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/MapSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/MapSettingsCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/MapSettingsCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -33,8 +33,9 @@
namespace Maestro.Editors.Fusion
{
- [ToolboxItem(true)]
- public partial class MapSettingsCtrl : EditorBindableCollapsiblePanel
+ [ToolboxItem(false)]
+ //[ToolboxItem(true)]
+ internal partial class MapSettingsCtrl : EditorBindableCollapsiblePanel
{
public MapSettingsCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/NewWidgetDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/NewWidgetDialog.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/NewWidgetDialog.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -28,7 +28,7 @@
namespace Maestro.Editors.Fusion
{
- public partial class NewWidgetDialog : Form
+ internal partial class NewWidgetDialog : Form
{
private IApplicationDefinition _appDef;
private FlexibleLayoutEditorContext _context;
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/AboutWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/AboutWidgetCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/AboutWidgetCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -28,7 +28,8 @@
namespace Maestro.Editors.Fusion.WidgetEditors
{
- public partial class AboutWidgetCtrl : UserControl, IWidgetEditor
+ [ToolboxItem(false)]
+ internal partial class AboutWidgetCtrl : UserControl, IWidgetEditor
{
public AboutWidgetCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/ActivityIndicatorWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/ActivityIndicatorWidgetCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/ActivityIndicatorWidgetCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -28,7 +28,8 @@
namespace Maestro.Editors.Fusion.WidgetEditors
{
- public partial class ActivityIndicatorWidgetCtrl : UserControl, IWidgetEditor
+ [ToolboxItem(false)]
+ internal partial class ActivityIndicatorWidgetCtrl : UserControl, IWidgetEditor
{
public ActivityIndicatorWidgetCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/BufferPanelWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/BufferPanelWidgetCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/BufferPanelWidgetCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -29,7 +29,8 @@
namespace Maestro.Editors.Fusion.WidgetEditors
{
- public partial class BufferPanelWidgetCtrl : UserControl, IWidgetEditor, INotifyPropertyChanged
+ [ToolboxItem(false)]
+ internal partial class BufferPanelWidgetCtrl : UserControl, IWidgetEditor, INotifyPropertyChanged
{
public BufferPanelWidgetCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/BufferWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/BufferWidgetCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/BufferWidgetCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -32,7 +32,8 @@
namespace Maestro.Editors.Fusion.WidgetEditors
{
- public partial class BufferWidgetCtrl : UserControl, IWidgetEditor, INotifyPropertyChanged
+ [ToolboxItem(false)]
+ internal partial class BufferWidgetCtrl : UserControl, IWidgetEditor, INotifyPropertyChanged
{
public BufferWidgetCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/CenterSelectionWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/CenterSelectionWidgetCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/CenterSelectionWidgetCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -27,7 +27,8 @@
namespace Maestro.Editors.Fusion.WidgetEditors
{
- public partial class CenterSelectionWidgetCtrl : WidgetEditorBase
+ [ToolboxItem(false)]
+ internal partial class CenterSelectionWidgetCtrl : WidgetEditorBase
{
public CenterSelectionWidgetCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/ClearSelectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/ClearSelectionCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/ClearSelectionCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -27,7 +27,8 @@
namespace Maestro.Editors.Fusion.WidgetEditors
{
- public partial class ClearSelectionCtrl : WidgetEditorBase
+ [ToolboxItem(false)]
+ internal partial class ClearSelectionCtrl : WidgetEditorBase
{
public ClearSelectionCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/ColorPickerWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/ColorPickerWidgetCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/ColorPickerWidgetCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -28,7 +28,8 @@
namespace Maestro.Editors.Fusion.WidgetEditors
{
- public partial class ColorPickerWidgetCtrl : UserControl, IWidgetEditor
+ [ToolboxItem(false)]
+ internal partial class ColorPickerWidgetCtrl : UserControl, IWidgetEditor
{
public ColorPickerWidgetCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/CursorPositionWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/CursorPositionWidgetCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/CursorPositionWidgetCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -29,7 +29,8 @@
namespace Maestro.Editors.Fusion.WidgetEditors
{
- public partial class CursorPositionWidgetCtrl : UserControl, IWidgetEditor
+ [ToolboxItem(false)]
+ internal partial class CursorPositionWidgetCtrl : UserControl, IWidgetEditor
{
public CursorPositionWidgetCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/EditableScaleWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/EditableScaleWidgetCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/EditableScaleWidgetCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -29,7 +29,8 @@
namespace Maestro.Editors.Fusion.WidgetEditors
{
- public partial class EditableScaleWidgetCtrl : UserControl, IWidgetEditor
+ [ToolboxItem(false)]
+ internal partial class EditableScaleWidgetCtrl : UserControl, IWidgetEditor
{
public EditableScaleWidgetCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/ExtentHistoryWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/ExtentHistoryWidgetCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/ExtentHistoryWidgetCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -29,7 +29,8 @@
namespace Maestro.Editors.Fusion.WidgetEditors
{
- public partial class ExtentHistoryWidgetCtrl : UserControl, IWidgetEditor
+ [ToolboxItem(false)]
+ internal partial class ExtentHistoryWidgetCtrl : UserControl, IWidgetEditor
{
public ExtentHistoryWidgetCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/FeatureInfoWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/FeatureInfoWidgetCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/FeatureInfoWidgetCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -28,7 +28,8 @@
namespace Maestro.Editors.Fusion.WidgetEditors
{
- public partial class FeatureInfoWidgetCtrl : UserControl, IWidgetEditor
+ [ToolboxItem(false)]
+ internal partial class FeatureInfoWidgetCtrl : UserControl, IWidgetEditor
{
public FeatureInfoWidgetCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/GenericWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/GenericWidgetCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/GenericWidgetCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -32,7 +32,8 @@
/// <summary>
/// A generic widget editor that edits the underlying XML content
/// </summary>
- public partial class GenericWidgetCtrl : UserControl, IWidgetEditor
+ [ToolboxItem(false)]
+ internal partial class GenericWidgetCtrl : UserControl, IWidgetEditor
{
public GenericWidgetCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/HelpWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/HelpWidgetCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/HelpWidgetCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -28,7 +28,8 @@
namespace Maestro.Editors.Fusion.WidgetEditors
{
- public partial class HelpWidgetCtrl : UserControl, IWidgetEditor
+ [ToolboxItem(false)]
+ internal partial class HelpWidgetCtrl : UserControl, IWidgetEditor
{
public HelpWidgetCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/InitialMapViewWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/InitialMapViewWidgetCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/InitialMapViewWidgetCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -29,7 +29,8 @@
namespace Maestro.Editors.Fusion.WidgetEditors
{
- public partial class InitialMapViewWidgetCtrl : UserControl, IWidgetEditor
+ [ToolboxItem(false)]
+ internal partial class InitialMapViewWidgetCtrl : UserControl, IWidgetEditor
{
public InitialMapViewWidgetCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/InvokeScriptWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/InvokeScriptWidgetCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/InvokeScriptWidgetCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -28,7 +28,8 @@
namespace Maestro.Editors.Fusion.WidgetEditors
{
- public partial class InvokeScriptWidgetCtrl : UserControl, IWidgetEditor
+ [ToolboxItem(false)]
+ internal partial class InvokeScriptWidgetCtrl : UserControl, IWidgetEditor
{
public InvokeScriptWidgetCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/LegendWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/LegendWidgetCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/LegendWidgetCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -28,7 +28,8 @@
namespace Maestro.Editors.Fusion.WidgetEditors
{
- public partial class LegendWidgetCtrl : UserControl, IWidgetEditor
+ [ToolboxItem(false)]
+ internal partial class LegendWidgetCtrl : UserControl, IWidgetEditor
{
public LegendWidgetCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/LinkToViewWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/LinkToViewWidgetCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/LinkToViewWidgetCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -27,7 +27,8 @@
namespace Maestro.Editors.Fusion.WidgetEditors
{
- public partial class LinkToViewWidgetCtrl : WidgetEditorBase
+ [ToolboxItem(false)]
+ internal partial class LinkToViewWidgetCtrl : WidgetEditorBase
{
public LinkToViewWidgetCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/MapMenuWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/MapMenuWidgetCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/MapMenuWidgetCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -29,7 +29,8 @@
namespace Maestro.Editors.Fusion.WidgetEditors
{
- public partial class MapMenuWidgetCtrl : UserControl, IWidgetEditor
+ [ToolboxItem(false)]
+ internal partial class MapMenuWidgetCtrl : UserControl, IWidgetEditor
{
public MapMenuWidgetCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/MapTipWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/MapTipWidgetCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/MapTipWidgetCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -27,7 +27,8 @@
namespace Maestro.Editors.Fusion.WidgetEditors
{
- public partial class MapTipWidgetCtrl : UserControl
+ [ToolboxItem(false)]
+ internal partial class MapTipWidgetCtrl : UserControl
{
public MapTipWidgetCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/MeasureWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/MeasureWidgetCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/MeasureWidgetCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -27,7 +27,8 @@
namespace Maestro.Editors.Fusion.WidgetEditors
{
- public partial class MeasureWidgetCtrl : UserControl
+ [ToolboxItem(false)]
+ internal partial class MeasureWidgetCtrl : UserControl
{
public MeasureWidgetCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/NavigatorWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/NavigatorWidgetCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/NavigatorWidgetCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -27,7 +27,8 @@
namespace Maestro.Editors.Fusion.WidgetEditors
{
- public partial class NavigatorWidgetCtrl : WidgetEditorBase
+ [ToolboxItem(false)]
+ internal partial class NavigatorWidgetCtrl : WidgetEditorBase
{
public NavigatorWidgetCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/PanWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/PanWidgetCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/PanWidgetCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -27,7 +27,8 @@
namespace Maestro.Editors.Fusion.WidgetEditors
{
- public partial class PanWidgetCtrl : WidgetEditorBase
+ [ToolboxItem(false)]
+ internal partial class PanWidgetCtrl : WidgetEditorBase
{
public PanWidgetCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/RefreshMapWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/RefreshMapWidgetCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/RefreshMapWidgetCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -27,7 +27,8 @@
namespace Maestro.Editors.Fusion.WidgetEditors
{
- public partial class RefreshMapWidgetCtrl : WidgetEditorBase
+ [ToolboxItem(false)]
+ internal partial class RefreshMapWidgetCtrl : WidgetEditorBase
{
public RefreshMapWidgetCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/SelectionPanelWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/SelectionPanelWidgetCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/SelectionPanelWidgetCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -27,7 +27,8 @@
namespace Maestro.Editors.Fusion.WidgetEditors
{
- public partial class SelectionPanelWidgetCtrl : WidgetEditorBase
+ [ToolboxItem(false)]
+ internal partial class SelectionPanelWidgetCtrl : WidgetEditorBase
{
public SelectionPanelWidgetCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetManagementDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetManagementDialog.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetManagementDialog.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -28,7 +28,7 @@
namespace Maestro.Editors.Fusion
{
- public partial class WidgetManagementDialog : Form, INotifyResourceChanged
+ internal partial class WidgetManagementDialog : Form, INotifyResourceChanged
{
private IApplicationDefinition _appDef;
private FlexibleLayoutEditorContext _context;
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetReferenceCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetReferenceCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetReferenceCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -28,7 +28,8 @@
namespace Maestro.Editors.Fusion
{
- public partial class WidgetReferenceCtrl : UserControl
+ [ToolboxItem(false)]
+ internal partial class WidgetReferenceCtrl : UserControl
{
private WidgetReferenceCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetSettingsCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetSettingsCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -31,8 +31,9 @@
namespace Maestro.Editors.Fusion
{
- [ToolboxItem(true)]
- public partial class WidgetSettingsCtrl : EditorBindableCollapsiblePanel
+ [ToolboxItem(false)]
+ //[ToolboxItem(true)]
+ internal partial class WidgetSettingsCtrl : EditorBindableCollapsiblePanel
{
public WidgetSettingsCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/LayerPropertiesSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/LayerPropertiesSectionCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/LayerPropertiesSectionCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -12,7 +12,8 @@
namespace Maestro.Editors.LayerDefinition
{
- [ToolboxItem(true)]
+ //[ToolboxItem(true)]
+ [ToolboxItem(false)]
internal partial class LayerPropertiesSectionCtrl : EditorBindableCollapsiblePanel
{
public LayerPropertiesSectionCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerAdvancedSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerAdvancedSectionCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerAdvancedSectionCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -30,8 +30,8 @@
namespace Maestro.Editors.LayerDefinition.Raster
{
- [ToolboxItem(true)]
- public partial class RasterLayerAdvancedSectionCtrl : EditorBindableCollapsiblePanel
+ [ToolboxItem(false)]
+ internal partial class RasterLayerAdvancedSectionCtrl : EditorBindableCollapsiblePanel
{
public RasterLayerAdvancedSectionCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -35,8 +35,8 @@
namespace Maestro.Editors.LayerDefinition.Raster
{
- [ToolboxItem(true)]
- public partial class RasterLayerSettingsSectionCtrl : EditorBindableCollapsiblePanel
+ [ToolboxItem(false)]
+ internal partial class RasterLayerSettingsSectionCtrl : EditorBindableCollapsiblePanel
{
public RasterLayerSettingsSectionCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerVisibilitySectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerVisibilitySectionCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerVisibilitySectionCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -31,8 +31,9 @@
namespace Maestro.Editors.LayerDefinition.Raster
{
- [ToolboxItem(true)]
- public partial class RasterLayerVisibilitySectionCtrl : EditorBindableCollapsiblePanel
+ //[ToolboxItem(true)]
+ [ToolboxItem(false)]
+ internal partial class RasterLayerVisibilitySectionCtrl : EditorBindableCollapsiblePanel
{
public RasterLayerVisibilitySectionCtrl()
{
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/Condition.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/Condition.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/Condition.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -29,6 +29,7 @@
namespace Maestro.Editors.LayerDefinition.Vector.Scales
{
+ [ToolboxItem(false)]
internal partial class Condition : UserControl
{
private IPointRule m_prt;
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionList.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionList.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionList.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -29,6 +29,7 @@
namespace Maestro.Editors.LayerDefinition.Vector.Scales
{
+ [ToolboxItem(false)]
internal partial class ConditionList : UserControl
{
private IPointVectorStyle m_point;
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionListButtons.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionListButtons.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ConditionListButtons.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -32,6 +32,7 @@
namespace Maestro.Editors.LayerDefinition.Vector.Scales
{
+ [ToolboxItem(false)]
internal partial class ConditionListButtons : UserControl
{
private IPointVectorStyle m_point;
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ItemStyle.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ItemStyle.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ItemStyle.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -30,6 +30,7 @@
namespace Maestro.Editors.LayerDefinition.Vector.Scales
{
+ [ToolboxItem(false)]
internal partial class ItemStyle : UserControl
{
private ITextSymbol m_label;
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRange.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRange.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRange.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -30,6 +30,7 @@
namespace Maestro.Editors.LayerDefinition.Vector.Scales
{
+ [ToolboxItem(false)]
internal partial class ScaleRange : UserControl
{
private IVectorScaleRange m_vsc;
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeConditions.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeConditions.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeConditions.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -30,6 +30,7 @@
namespace Maestro.Editors.LayerDefinition.Vector.Scales
{
+ [ToolboxItem(false)]
internal partial class ScaleRangeConditions: UserControl
{
public event EventHandler ItemChanged;
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeList.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeList.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeList.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -31,6 +31,7 @@
namespace OSGeo.MapGuide.Maestro.ResourceEditors.LayerEditorControls.ScaleControls
{
+ [ToolboxItem(false)]
internal partial class ScaleRangeList : UserControl
{
private IVectorLayerDefinition m_vldef;
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -33,6 +33,7 @@
/// <summary>
/// Summary description for AreaFeatureStyleEditor.
/// </summary>
+ [ToolboxItem(false)]
internal class AreaFeatureStyleEditor : System.Windows.Forms.UserControl
{
private System.Windows.Forms.ComboBox sizeContextCombo;
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FillStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FillStyleEditor.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FillStyleEditor.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -30,6 +30,7 @@
/// <summary>
/// Summary description for FillStyleEditor.
/// </summary>
+ [ToolboxItem(false)]
internal class FillStyleEditor : System.Windows.Forms.UserControl
{
public ImageStylePicker fillCombo;
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -34,6 +34,7 @@
/// <summary>
/// Summary description for FontStyleEditor.
/// </summary>
+ [ToolboxItem(false)]
internal class FontStyleEditor : System.Windows.Forms.UserControl
{
private System.Windows.Forms.Label label1;
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineFeatureStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineFeatureStyleEditor.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineFeatureStyleEditor.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -35,6 +35,7 @@
/// <summary>
/// Summary description for LineFeatureStyleEditor.
/// </summary>
+ [ToolboxItem(false)]
internal class LineFeatureStyleEditor : System.Windows.Forms.UserControl
{
/// <summary>
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineStyleEditor.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineStyleEditor.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -30,6 +30,7 @@
/// <summary>
/// Summary description for LineStyleEditor.
/// </summary>
+ [ToolboxItem(false)]
internal class LineStyleEditor : System.Windows.Forms.UserControl
{
public ImageStylePicker fillCombo;
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -38,6 +38,7 @@
/// <summary>
/// Summary description for PointFeatureStyleEditor.
/// </summary>
+ [ToolboxItem(false)]
internal class PointFeatureStyleEditor : System.Windows.Forms.UserControl
{
private System.Windows.Forms.GroupBox groupBox1;
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ScaleRangeEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ScaleRangeEditor.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ScaleRangeEditor.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -29,6 +29,7 @@
/// <summary>
/// Summary description for ScaleRangeEditor.
/// </summary>
+ [ToolboxItem(false)]
internal class ScaleRangeEditor : System.Windows.Forms.UserControl
{
/// <summary>
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -35,7 +35,8 @@
namespace Maestro.Editors.LayerDefinition.Vector
{
- [ToolboxItem(true)]
+ //[ToolboxItem(true)]
+ [ToolboxItem(false)]
internal partial class VectorLayerSettingsSectionCtrl : EditorBindableCollapsiblePanel
{
public VectorLayerSettingsSectionCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerStyleSectionCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -32,7 +32,8 @@
namespace Maestro.Editors.LayerDefinition.Vector
{
- [ToolboxItem(true)]
+ [ToolboxItem(false)]
+ //[ToolboxItem(true)]
internal partial class VectorLayerStyleSectionCtrl : EditorBindableCollapsiblePanel
{
public VectorLayerStyleSectionCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/DwfTransformationCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/DwfTransformationCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/DwfTransformationCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -30,6 +30,7 @@
namespace Maestro.Editors.LoadProcedure
{
+ [ToolboxItem(false)]
internal partial class DwfTransformationCtrl : EditorBindableCollapsiblePanel
{
public DwfTransformationCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/ExecuteCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/ExecuteCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/ExecuteCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -27,6 +27,7 @@
namespace Maestro.Editors.LoadProcedure
{
+ [ToolboxItem(false)]
internal partial class ExecuteCtrl : UserControl
{
internal event EventHandler Execute;
Modified: trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/InputFilesCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/InputFilesCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/InputFilesCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -31,6 +31,7 @@
namespace Maestro.Editors.LoadProcedure
{
+ [ToolboxItem(false)]
internal partial class InputFilesCtrl : EditorBindableCollapsiblePanel
{
public InputFilesCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/LoadTargetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/LoadTargetCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/LoadTargetCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -30,6 +30,7 @@
namespace Maestro.Editors.LoadProcedure
{
+ [ToolboxItem(false)]
internal partial class LoadTargetCtrl : EditorBindableCollapsiblePanel
{
public LoadTargetCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/SdfTransformationCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/SdfTransformationCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/SdfTransformationCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -31,6 +31,7 @@
namespace Maestro.Editors.LoadProcedure
{
+ [ToolboxItem(false)]
internal partial class SdfTransformationCtrl : EditorBindableCollapsiblePanel
{
public SdfTransformationCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/ShpTransformationCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/ShpTransformationCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/ShpTransformationCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -31,6 +31,7 @@
namespace Maestro.Editors.LoadProcedure
{
+ [ToolboxItem(false)]
internal partial class ShpTransformationCtrl : EditorBindableCollapsiblePanel
{
public ShpTransformationCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/SqliteTransformationCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/SqliteTransformationCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/LoadProcedure/SqliteTransformationCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -30,6 +30,7 @@
namespace Maestro.Editors.LoadProcedure
{
+ [ToolboxItem(false)]
internal partial class SqliteTransformationCtrl : EditorBindableCollapsiblePanel
{
public SqliteTransformationCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/FiniteScaleListCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/FiniteScaleListCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/FiniteScaleListCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -29,6 +29,7 @@
namespace Maestro.Editors.MapDefinition
{
+ [ToolboxItem(false)]
internal partial class FiniteScaleListCtrl : UserControl
{
internal FiniteScaleListCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/GroupPropertiesCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/GroupPropertiesCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/GroupPropertiesCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -29,6 +29,7 @@
namespace Maestro.Editors.MapDefinition
{
+ [ToolboxItem(false)]
internal partial class GroupPropertiesCtrl : UserControl
{
private GroupPropertiesCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -32,6 +32,7 @@
namespace Maestro.Editors.MapDefinition
{
+ [ToolboxItem(false)]
internal partial class LayerPropertiesCtrl : UserControl
{
private LayerPropertiesCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -39,7 +39,8 @@
/// </summary>
public delegate void OpenLayerEventHandler(object sender, string layerResourceId);
- [ToolboxItem(true)]
+ //[ToolboxItem(true)]
+ [ToolboxItem(false)]
internal partial class MapLayersSectionCtrl : EditorBindableCollapsiblePanel
{
public MapLayersSectionCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapSettingsSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapSettingsSectionCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapSettingsSectionCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -35,7 +35,8 @@
namespace Maestro.Editors.MapDefinition
{
- [ToolboxItem(true)]
+ //[ToolboxItem(true)]
+ [ToolboxItem(false)]
internal partial class MapSettingsSectionCtrl : EditorBindableCollapsiblePanel
{
public MapSettingsSectionCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/PrintLayout/PrintCustomLogosSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/PrintLayout/PrintCustomLogosSectionCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/PrintLayout/PrintCustomLogosSectionCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -31,7 +31,8 @@
namespace Maestro.Editors.PrintLayout
{
- [ToolboxItem(true)]
+ //[ToolboxItem(true)]
+ [ToolboxItem(false)]
internal partial class PrintCustomLogosSectionCtrl : EditorBindableCollapsiblePanel
{
public PrintCustomLogosSectionCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/PrintLayout/PrintCustomTextSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/PrintLayout/PrintCustomTextSectionCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/PrintLayout/PrintCustomTextSectionCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -30,7 +30,8 @@
namespace Maestro.Editors.PrintLayout
{
- [ToolboxItem(true)]
+ //[ToolboxItem(true)]
+ [ToolboxItem(false)]
internal partial class PrintCustomTextSectionCtrl : EditorBindableCollapsiblePanel
{
public PrintCustomTextSectionCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/PrintLayout/PrintPagePropertiesSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/PrintLayout/PrintPagePropertiesSectionCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/PrintLayout/PrintPagePropertiesSectionCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -30,7 +30,8 @@
namespace Maestro.Editors.PrintLayout
{
- [ToolboxItem(true)]
+ //[ToolboxItem(true)]
+ [ToolboxItem(false)]
internal partial class PrintPagePropertiesSectionCtrl : EditorBindableCollapsiblePanel
{
public PrintPagePropertiesSectionCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/WebLayout/Commands/InvokeScriptCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/Commands/InvokeScriptCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/Commands/InvokeScriptCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -29,6 +29,7 @@
namespace Maestro.Editors.WebLayout.Commands
{
+ [ToolboxItem(false)]
internal partial class InvokeScriptCtrl : UserControl
{
public InvokeScriptCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/WebLayout/Commands/InvokeURLCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/Commands/InvokeURLCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/Commands/InvokeURLCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -31,6 +31,7 @@
namespace Maestro.Editors.WebLayout.Commands
{
+ [ToolboxItem(false)]
internal partial class InvokeURLCtrl : EditorBase
{
public InvokeURLCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/WebLayout/Commands/SearchCmdCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/Commands/SearchCmdCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/Commands/SearchCmdCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -35,6 +35,7 @@
namespace Maestro.Editors.WebLayout.Commands
{
+ [ToolboxItem(false)]
internal partial class SearchCmdCtrl : EditorBase
{
public SearchCmdCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/WebLayout/CustomCommandPropertyCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/CustomCommandPropertyCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/CustomCommandPropertyCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -30,6 +30,7 @@
namespace Maestro.Editors.WebLayout
{
+ [ToolboxItem(false)]
internal partial class CustomCommandPropertyCtrl : EditorBase
{
public CustomCommandPropertyCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/WebLayout/MenuEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/MenuEditorCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/MenuEditorCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -30,6 +30,7 @@
namespace Maestro.Editors.WebLayout
{
+ [ToolboxItem(false)]
internal partial class MenuEditorCtrl : EditorBase
{
public MenuEditorCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutCommandsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutCommandsCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutCommandsCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -31,7 +31,8 @@
namespace Maestro.Editors.WebLayout
{
- [ToolboxItem(true)]
+ //[ToolboxItem(true)]
+ [ToolboxItem(false)]
internal partial class WebLayoutCommandsCtrl : EditorBindableCollapsiblePanel
{
public WebLayoutCommandsCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutMenusCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutMenusCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutMenusCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -32,7 +32,8 @@
namespace Maestro.Editors.WebLayout
{
- [ToolboxItem(true)]
+ //[ToolboxItem(true)]
+ [ToolboxItem(false)]
internal partial class WebLayoutMenusCtrl : EditorBindableCollapsiblePanel
{
public WebLayoutMenusCtrl()
Modified: trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -33,7 +33,8 @@
namespace Maestro.Editors.WebLayout
{
- [ToolboxItem(true)]
+ //[ToolboxItem(true)]
+ [ToolboxItem(false)]
internal partial class WebLayoutSettingsCtrl : EditorBindableCollapsiblePanel
{
public WebLayoutSettingsCtrl()
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj 2011-03-09 13:17:54 UTC (rev 5614)
@@ -208,6 +208,7 @@
<Compile Include="Feature\ReaderBase.cs" />
<Compile Include="Feature\RecordBase.cs" />
<Compile Include="ObjectModels\IFdoSpatialContext.cs" />
+ <Compile Include="ObjectModels\SymbolDefFactory.cs" />
<Compile Include="SchemaOverrides\GdalConfigurationDocument.cs" />
<Compile Include="SchemaOverrides\GdalRasterItem.cs" />
<Compile Include="SchemaOverrides\OdbcTableItem.cs" />
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ObjectFactory.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ObjectFactory.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/ObjectFactory.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -53,6 +53,14 @@
/// Factory method signature for creating web layouts
/// </summary>
public delegate IWebLayout WebLayoutCreatorFunc(string mapDefinitionId);
+ /// <summary>
+ /// Factory method signature for creating compound symbol definitions
+ /// </summary>
+ public delegate ICompoundSymbolDefinition CompoundSymbolDefCreatorFunc();
+ /// <summary>
+ /// Factory methods signature for creating simple symbol definitions
+ /// </summary>
+ public delegate ISimpleSymbolDefinition SimpleSymbolDefCreatorFunc();
/// <summary>
/// Factory class to create MapGuide resource objects with either pre-defined or
@@ -74,12 +82,16 @@
private static Dictionary<Version, LayerCreatorFunc> _layerFactories;
private static Dictionary<LoadType, LoadProcCreatorFunc> _loadProcFactories;
private static Dictionary<Version, WebLayoutCreatorFunc> _wlFactories;
+ private static Dictionary<Version, SimpleSymbolDefCreatorFunc> _simpleSymbolFactories;
+ private static Dictionary<Version, CompoundSymbolDefCreatorFunc> _compoundSymbolFactories;
static ObjectFactory()
{
_layerFactories = new Dictionary<Version,LayerCreatorFunc>();
_wlFactories = new Dictionary<Version, WebLayoutCreatorFunc>();
_loadProcFactories = new Dictionary<LoadType, LoadProcCreatorFunc>();
+ _simpleSymbolFactories = new Dictionary<Version, SimpleSymbolDefCreatorFunc>();
+ _compoundSymbolFactories = new Dictionary<Version, CompoundSymbolDefCreatorFunc>();
_layerFactories.Add(
new Version(1, 0, 0),
@@ -98,9 +110,43 @@
_wlFactories.Add(
new Version(1, 0, 0),
new WebLayoutCreatorFunc(OSGeo.MapGuide.ObjectModels.WebLayout_1_0_0.WebLayoutEntryPoint.CreateDefault));
+
+ _compoundSymbolFactories.Add(
+ new Version(1, 0, 0),
+ new CompoundSymbolDefCreatorFunc(OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_0_0.CompoundSymbolDefinition.CreateDefault));
+
+ _simpleSymbolFactories.Add(
+ new Version(1, 0, 0),
+ new SimpleSymbolDefCreatorFunc(OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_0_0.SimpleSymbolDefinition.CreateDefault));
}
/// <summary>
+ /// Registers the compound symbol factory method
+ /// </summary>
+ /// <param name="ver"></param>
+ /// <param name="func"></param>
+ public static void RegisterCompoundSymbolFactoryMethod(Version ver, CompoundSymbolDefCreatorFunc func)
+ {
+ if (_compoundSymbolFactories.ContainsKey(ver))
+ throw new ArgumentException(OSGeo.MapGuide.MaestroAPI.Properties.Resources.FactoryMethodAlreadyRegistered + ver);
+
+ _compoundSymbolFactories[ver] = func;
+ }
+
+ /// <summary>
+ /// Regsiters the simple symbol factory method
+ /// </summary>
+ /// <param name="ver"></param>
+ /// <param name="func"></param>
+ public static void RegisterSimpleSymbolFactoryMethod(Version ver, SimpleSymbolDefCreatorFunc func)
+ {
+ if (_simpleSymbolFactories.ContainsKey(ver))
+ throw new ArgumentException(OSGeo.MapGuide.MaestroAPI.Properties.Resources.FactoryMethodAlreadyRegistered + ver);
+
+ _simpleSymbolFactories[ver] = func;
+ }
+
+ /// <summary>
/// Registers the layer factory method.
/// </summary>
/// <param name="ver">The ver.</param>
@@ -287,11 +333,18 @@
/// </summary>
/// <param name="owner">The owner.</param>
/// <returns></returns>
- public static SimpleSymbolDefinition CreateSimpleSymbol(IServerConnection owner)
+ public static ISimpleSymbolDefinition CreateSimpleSymbol(IServerConnection owner, Version version, string name, string description)
{
Check.NotNull(owner, "owner");
- return new SimpleSymbolDefinition() { CurrentConnection = owner };
+ if (!_simpleSymbolFactories.ContainsKey(version))
+ throw new ArgumentException(OSGeo.MapGuide.MaestroAPI.Properties.Resources.UnknownSymbolDefVersion + version.ToString());
+
+ var simp = _simpleSymbolFactories[version]();
+ simp.CurrentConnection = owner;
+ simp.Name = name;
+ simp.Description = description;
+ return simp;
}
/// <summary>
@@ -299,11 +352,18 @@
/// </summary>
/// <param name="owner">The owner.</param>
/// <returns></returns>
- public static CompoundSymbolDefinition CreateCompoundSymbol(IServerConnection owner)
+ public static ICompoundSymbolDefinition CreateCompoundSymbol(IServerConnection owner, Version version, string name, string description)
{
Check.NotNull(owner, "owner");
- return new CompoundSymbolDefinition() { CurrentConnection = owner };
+ if (!_compoundSymbolFactories.ContainsKey(version))
+ throw new ArgumentException(OSGeo.MapGuide.MaestroAPI.Properties.Resources.UnknownSymbolDefVersion + version.ToString());
+
+ var comp = _compoundSymbolFactories[version]();
+ comp.CurrentConnection = owner;
+ comp.Name = name;
+ comp.Description = description;
+ return comp;
}
static readonly string[] parameterizedWidgets =
Added: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefFactory.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefFactory.cs (rev 0)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefFactory.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -0,0 +1,72 @@
+#region Disclaimer / License
+// Copyright (C) 2011, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+#endregion
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using System.IO;
+using System.Xml;
+using OSGeo.MapGuide.MaestroAPI.Exceptions;
+
+#if SYM_DEF_110
+namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_1_0
+#else
+namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_0_0
+#endif
+{
+ public static class SymbolDefEntryPoint
+ {
+ public static ICompoundSymbolDefinition CreateDefaultCompound()
+ {
+ return CompoundSymbolDefinition.CreateDefault();
+ }
+
+ public static ISimpleSymbolDefinition CreateDefaultSimple()
+ {
+ return SimpleSymbolDefinition.CreateDefault();
+ }
+
+ public static Stream Serialize(IResource res)
+ {
+ return res.SerializeToStream();
+ }
+
+ public static IResource Deserialize(string xml)
+ {
+ //HACK: We have to peek at the XML to determine if this is simple or compound.
+ var doc = new XmlDocument();
+ doc.LoadXml(xml);
+ var node = doc.SelectSingleNode("//SimpleSymbolDefinition");
+ if (node != null)
+ {
+ return SimpleSymbolDefinition.Deserialize(xml);
+ }
+ else
+ {
+ node = doc.SelectSingleNode("//CompoundSymbolDefinition");
+ if (node != null)
+ return CompoundSymbolDefinition.Deserialize(xml);
+ else //WTF?
+ throw new SerializationException("Could not determine symbol type"); //LOCALIZE
+ }
+ }
+ }
+}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefinition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefinition.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolDefinition.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -23,14 +23,34 @@
using OSGeo.MapGuide.MaestroAPI.Resource;
using System.Xml.Serialization;
using OSGeo.MapGuide.MaestroAPI;
+using OSGeo.MapGuide.ObjectModels.SymbolDefinition;
+using System.Globalization;
+using OSGeo.MapGuide.MaestroAPI.Exceptions;
+using System.Xml;
+using System.IO;
#pragma warning disable 1591, 0114, 0108
-namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition
+#if SYM_DEF_110
+namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_1_0
+#else
+namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_0_0
+#endif
{
- partial class SimpleSymbolDefinition : IResource
+ partial class SimpleSymbolDefinition : ISimpleSymbolDefinition
{
- internal SimpleSymbolDefinition() { }
+ public static SimpleSymbolDefinition CreateDefault()
+ {
+ var simpleSym = new SimpleSymbolDefinition()
+ {
+ Graphics = new System.ComponentModel.BindingList<GraphicBase>(),
+ ParameterDefinition = new ParameterDefinition()
+ {
+ Parameter = new System.ComponentModel.BindingList<Parameter>()
+ }
+ };
+ return simpleSym;
+ }
private static readonly Version RES_VERSION = new Version(1, 0, 0);
@@ -99,12 +119,829 @@
{
get { return true; }
}
+
+ IEnumerable<IGraphicBase> ISimpleSymbolDefinition.Graphics
+ {
+ get
+ {
+ foreach (var g in this.Graphics)
+ {
+ yield return g;
+ }
+ }
+ }
+
+ void ISimpleSymbolDefinition.AddGraphics(IGraphicBase graphics)
+ {
+ var g = graphics as GraphicBase;
+ if (g != null)
+ {
+ this.Graphics.Add(g);
+ }
+ }
+
+ void ISimpleSymbolDefinition.RemoveGraphics(IGraphicBase graphics)
+ {
+ var g = graphics as GraphicBase;
+ if (g != null)
+ {
+ this.Graphics.Remove(g);
+ }
+ }
+
+ IResizeBox ISimpleSymbolDefinition.ResizeBox
+ {
+ get
+ {
+ return resizeBoxField;
+ }
+ set
+ {
+ resizeBoxField = (ResizeBox)value;
+ }
+ }
+
+ IPointUsage ISimpleSymbolDefinition.PointUsage
+ {
+ get
+ {
+ return pointUsageField;
+ }
+ set
+ {
+ pointUsageField = (PointUsage)value;
+ }
+ }
+
+ ILineUsage ISimpleSymbolDefinition.LineUsage
+ {
+ get
+ {
+ return lineUsageField;
+ }
+ set
+ {
+ lineUsageField = (LineUsage)value;
+ }
+ }
+
+ IAreaUsage ISimpleSymbolDefinition.AreaUsage
+ {
+ get
+ {
+ return areaUsageField;
+ }
+ set
+ {
+ areaUsageField = (AreaUsage)value;
+ }
+ }
+
+ IParameterDefinition ISimpleSymbolDefinition.ParameterDefinition
+ {
+ get { return parameterDefinitionField; }
+ }
}
- partial class CompoundSymbolDefinition : IResource
+#if SYM_DEF_110
+ partial class Text : IText2
+#else
+ partial class Text : IText
+#endif
{
- internal CompoundSymbolDefinition() { }
+ bool? IText.Bold
+ {
+ get
+ {
+ bool b;
+ if (!bool.TryParse(this.Bold, out b))
+ return b;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.Bold = value.Value ? "true" : "false";
+ else
+ this.Bold = null;
+ }
+ }
+
+ bool? IText.Italic
+ {
+ get
+ {
+ bool b;
+ if (!bool.TryParse(this.Italic, out b))
+ return b;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.Italic = value.Value ? "true" : "false";
+ else
+ this.Italic = null;
+ }
+ }
+
+ bool? IText.Underlined
+ {
+ get
+ {
+ bool b;
+ if (!bool.TryParse(this.Underlined, out b))
+ return b;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.Underlined = value.Value ? "true" : "false";
+ else
+ this.Underlined = null;
+ }
+ }
+
+ double? IText.Height
+ {
+ get
+ {
+ double d;
+ if (!double.TryParse(this.Height, out d))
+ return d;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.Height = value.Value.ToString(CultureInfo.InvariantCulture);
+ else
+ this.Height = null;
+ }
+ }
+
+ bool? IText.HeightScalable
+ {
+ get
+ {
+ bool b;
+ if (!bool.TryParse(this.HeightScalable, out b))
+ return b;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.HeightScalable = value.Value ? "true" : "false";
+ else
+ this.HeightScalable = null;
+ }
+ }
+
+ double? IText.Angle
+ {
+ get
+ {
+ double d;
+ if (!double.TryParse(this.Angle, out d))
+ return d;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.Angle = value.Value.ToString(CultureInfo.InvariantCulture);
+ else
+ this.Angle = null;
+ }
+ }
+
+ double? IText.PositionX
+ {
+ get
+ {
+ double d;
+ if (!double.TryParse(this.PositionX, out d))
+ return d;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.PositionX = value.Value.ToString(CultureInfo.InvariantCulture);
+ else
+ this.PositionX = null;
+ }
+ }
+
+ double? IText.PositionY
+ {
+ get
+ {
+ double d;
+ if (!double.TryParse(this.PositionY, out d))
+ return d;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.PositionY = value.Value.ToString(CultureInfo.InvariantCulture);
+ else
+ this.PositionY = null;
+ }
+ }
+
+ double? IText.LineSpacing
+ {
+ get
+ {
+ double d;
+ if (!double.TryParse(this.LineSpacing, out d))
+ return d;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.LineSpacing = value.Value.ToString(CultureInfo.InvariantCulture);
+ else
+ this.LineSpacing = null;
+ }
+ }
+
+ ITextFrame IText.Frame
+ {
+ get
+ {
+ return this.Frame;
+ }
+ set
+ {
+ this.Frame = (TextFrame)value;
+ }
+ }
+ }
+
+ partial class TextFrame : ITextFrame
+ {
+ double? ITextFrame.OffsetX
+ {
+ get
+ {
+ double d;
+ if (!double.TryParse(this.OffsetX, out d))
+ return d;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.OffsetX = value.Value.ToString(CultureInfo.InvariantCulture);
+ else
+ this.OffsetX = null;
+ }
+ }
+
+ double? ITextFrame.OffsetY
+ {
+ get
+ {
+ double d;
+ if (!double.TryParse(this.OffsetY, out d))
+ return d;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.OffsetY = value.Value.ToString(CultureInfo.InvariantCulture);
+ else
+ this.OffsetY = null;
+ }
+ }
+ }
+
+ partial class ResizeBox : IResizeBox
+ {
+ double? IResizeBox.SizeX
+ {
+ get
+ {
+ double d;
+ if (!double.TryParse(this.SizeX, out d))
+ return d;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.SizeX = value.Value.ToString(CultureInfo.InvariantCulture);
+ else
+ this.SizeX = null;
+ }
+ }
+
+ double? IResizeBox.SizeY
+ {
+ get
+ {
+ double d;
+ if (!double.TryParse(this.SizeY, out d))
+ return d;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.SizeY = value.Value.ToString(CultureInfo.InvariantCulture);
+ else
+ this.SizeY = null;
+ }
+ }
+
+ double? IResizeBox.PositionX
+ {
+ get
+ {
+ double d;
+ if (!double.TryParse(this.PositionX, out d))
+ return d;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.PositionX = value.Value.ToString(CultureInfo.InvariantCulture);
+ else
+ this.PositionX = null;
+ }
+ }
+
+ double? IResizeBox.PositionY
+ {
+ get
+ {
+ double d;
+ if (!double.TryParse(this.PositionY, out d))
+ return d;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.PositionY = value.Value.ToString(CultureInfo.InvariantCulture);
+ else
+ this.PositionY = null;
+ }
+ }
+ }
+
+ partial class Graphics : IGraphics
+ {
+ public IEnumerable<IGraphicBase> Elements
+ {
+ get
+ {
+ foreach (var g in this.Items)
+ {
+ yield return g;
+ }
+ }
+ }
+
+ public void AddGraphicElement(IGraphicBase graphics)
+ {
+ var g = graphics as GraphicBase;
+ if (g != null)
+ {
+ this.Items.Add(g);
+ }
+ }
+
+ public void RemoveGraphicElement(IGraphicBase graphics)
+ {
+ var g = graphics as GraphicBase;
+ if (g != null)
+ {
+ this.Items.Remove(g);
+ }
+ }
+ }
+
+ partial class GraphicBase : IGraphicBase
+ {
+
+ }
+
+ partial class Parameter : IParameter
+ {
+ string IParameter.DataType
+ {
+ get
+ {
+ return dataTypeField.ToString();
+ }
+ set
+ {
+#if SYM_DEF_110
+ dataTypeField = (DataType2)Enum.Parse(typeof(DataType2), value);
+#else
+ dataTypeField = (DataType)Enum.Parse(typeof(DataType), value);
+#endif
+ }
+ }
+ }
+
+
+ partial class ParameterDefinition : IParameterDefinition
+ {
+ IEnumerable<IParameter> IParameterDefinition.Parameter
+ {
+ get
+ {
+ foreach (var p in this.Parameter)
+ {
+ yield return p;
+ }
+ }
+ }
+
+ public void AddParameter(IParameter param)
+ {
+ var p = param as Parameter;
+ if (p != null)
+ {
+ this.Parameter.Add(p);
+ }
+ }
+
+ public void RemoveParameter(IParameter param)
+ {
+ var p = param as Parameter;
+ if (p != null)
+ {
+ this.Parameter.Remove(p);
+ }
+ }
+ }
+
+ partial class LineUsage : ILineUsage
+ {
+ double? ILineUsage.StartOffset
+ {
+ get
+ {
+ double d;
+ if (!double.TryParse(this.StartOffset, out d))
+ return d;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.StartOffset = value.Value.ToString(CultureInfo.InvariantCulture);
+ else
+ this.StartOffset = null;
+ }
+ }
+
+ double? ILineUsage.EndOffset
+ {
+ get
+ {
+ double d;
+ if (!double.TryParse(this.EndOffset, out d))
+ return d;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.EndOffset = value.Value.ToString(CultureInfo.InvariantCulture);
+ else
+ this.EndOffset = null;
+ }
+ }
+
+ double? ILineUsage.Repeat
+ {
+ get
+ {
+ double d;
+ if (!double.TryParse(this.Repeat, out d))
+ return d;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.Repeat = value.Value.ToString(CultureInfo.InvariantCulture);
+ else
+ this.Repeat = null;
+ }
+ }
+
+ double? ILineUsage.VertexAngleLimit
+ {
+ get
+ {
+ double d;
+ if (!double.TryParse(this.VertexAngleLimit, out d))
+ return d;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.VertexAngleLimit = value.Value.ToString(CultureInfo.InvariantCulture);
+ else
+ this.VertexAngleLimit = null;
+ }
+ }
+
+ IPath ILineUsage.DefaultPath
+ {
+ get
+ {
+ return this.DefaultPath;
+ }
+ set
+ {
+ this.DefaultPath = (Path)value;
+ }
+ }
+
+
+ double? IUsageBase.Angle
+ {
+ get
+ {
+ double d;
+ if (!double.TryParse(this.Angle, out d))
+ return d;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.Angle = value.Value.ToString(CultureInfo.InvariantCulture);
+ else
+ this.Angle = null;
+ }
+ }
+ }
+
+ partial class PointUsage : IPointUsage
+ {
+ double? IPointUsage.OriginOffsetX
+ {
+ get
+ {
+ double d;
+ if (!double.TryParse(this.OriginOffsetX, out d))
+ return d;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.OriginOffsetX = value.Value.ToString(CultureInfo.InvariantCulture);
+ else
+ this.OriginOffsetX = null;
+ }
+ }
+
+ double? IPointUsage.OriginOffsetY
+ {
+ get
+ {
+ double d;
+ if (!double.TryParse(this.OriginOffsetY, out d))
+ return d;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.OriginOffsetY = value.Value.ToString(CultureInfo.InvariantCulture);
+ else
+ this.OriginOffsetY = null;
+ }
+ }
+
+ string IUsageBase.AngleControl
+ {
+ get
+ {
+ return this.AngleControl;
+ }
+ set
+ {
+ this.AngleControl = value;
+ }
+ }
+
+ double? IUsageBase.Angle
+ {
+ get
+ {
+ double d;
+ if (!double.TryParse(this.Angle, out d))
+ return d;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.Angle = value.Value.ToString(CultureInfo.InvariantCulture);
+ else
+ this.Angle = null;
+ }
+ }
+ }
+
+ partial class AreaUsage : IAreaUsage
+ {
+ double? IAreaUsage.OriginX
+ {
+ get
+ {
+ double d;
+ if (!double.TryParse(this.OriginX, out d))
+ return d;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.OriginX = value.Value.ToString(CultureInfo.InvariantCulture);
+ else
+ this.OriginX = null;
+ }
+ }
+
+ double? IAreaUsage.OriginY
+ {
+ get
+ {
+ double d;
+ if (!double.TryParse(this.OriginY, out d))
+ return d;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.OriginY = value.Value.ToString(CultureInfo.InvariantCulture);
+ else
+ this.OriginY = null;
+ }
+ }
+
+ double? IAreaUsage.RepeatX
+ {
+ get
+ {
+ double d;
+ if (!double.TryParse(this.RepeatX, out d))
+ return d;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.RepeatX = value.Value.ToString(CultureInfo.InvariantCulture);
+ else
+ this.RepeatX = null;
+ }
+ }
+
+ double? IAreaUsage.RepeatY
+ {
+ get
+ {
+ double d;
+ if (!double.TryParse(this.RepeatY, out d))
+ return d;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.RepeatY = value.Value.ToString(CultureInfo.InvariantCulture);
+ else
+ this.RepeatY = null;
+ }
+ }
+
+ double? IAreaUsage.BufferWidth
+ {
+ get
+ {
+ double d;
+ if (!double.TryParse(this.BufferWidth, out d))
+ return d;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.BufferWidth = value.Value.ToString(CultureInfo.InvariantCulture);
+ else
+ this.BufferWidth = null;
+ }
+ }
+
+ double? IUsageBase.Angle
+ {
+ get
+ {
+ double d;
+ if (!double.TryParse(this.Angle, out d))
+ return d;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.Angle = value.Value.ToString(CultureInfo.InvariantCulture);
+ else
+ this.Angle = null;
+ }
+ }
+ }
+
+ partial class Path : IPath
+ {
+ double? IPath.LineWeight
+ {
+ get
+ {
+ double d;
+ if (!double.TryParse(this.LineWeight, out d))
+ return d;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.LineWeight = value.Value.ToString(CultureInfo.InvariantCulture);
+ else
+ this.LineWeight = null;
+ }
+ }
+
+ bool? IPath.LineWeightScalable
+ {
+ get
+ {
+ bool b;
+ if (!bool.TryParse(this.LineWeightScalable, out b))
+ return b;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.LineWeightScalable = value.Value ? "true" : "false";
+ else
+ this.LineWeightScalable = null;
+ }
+ }
+
+ double? IPath.LineMiterLimit
+ {
+ get
+ {
+ double d;
+ if (!double.TryParse(this.LineMiterLimit, out d))
+ return d;
+ return null;
+ }
+ set
+ {
+ if (value.HasValue)
+ this.LineMiterLimit = value.Value.ToString(CultureInfo.InvariantCulture);
+ else
+ this.LineMiterLimit = null;
+ }
+ }
+ }
+
+ partial class CompoundSymbolDefinition : ICompoundSymbolDefinition
+ {
+ public static CompoundSymbolDefinition CreateDefault()
+ {
+ var sym = new CompoundSymbolDefinition()
+ {
+ SimpleSymbol = new System.ComponentModel.BindingList<SimpleSymbol>(),
+ };
+ return sym;
+ }
+
private static readonly Version RES_VERSION = new Version(1, 0, 0);
[XmlIgnore]
@@ -172,5 +1009,92 @@
{
get { return true; }
}
+
+ IEnumerable<ISimpleSymbolReferenceBase> ICompoundSymbolDefinition.SimpleSymbol
+ {
+ get
+ {
+ foreach (var sym in this.SimpleSymbol)
+ {
+ yield return sym;
+ }
+ }
+ }
+
+ void ICompoundSymbolDefinition.AddSimpleSymbol(ISimpleSymbolReferenceBase sym)
+ {
+ var symb = sym as SimpleSymbol;
+ if (symb != null)
+ {
+ this.SimpleSymbol.Add(symb);
+ }
+ }
+
+ void ICompoundSymbolDefinition.RemoveSimpleSymbol(ISimpleSymbolReferenceBase sym)
+ {
+ var symb = sym as SimpleSymbol;
+ if (symb != null)
+ {
+ this.SimpleSymbol.Remove(symb);
+ }
+ }
}
+
+ partial class SimpleSymbol : ISimpleSymbolInlineReference, ISimpleSymbolLibraryReference
+ {
+ ISimpleSymbolDefinition ISimpleSymbolInlineReference.SimpleSymbolDefinition
+ {
+ get
+ {
+ return (ISimpleSymbolDefinition)this.Item;
+ }
+ set
+ {
+ this.Item = value;
+ }
+ }
+
+ public SimpleSymbolReferenceType Type
+ {
+ get
+ {
+ if (this.Item != null)
+ {
+ if (typeof(ISimpleSymbolDefinition).IsAssignableFrom(this.Item.GetType()))
+ return SimpleSymbolReferenceType.Inline;
+ else if (typeof(string) == this.Item.GetType())
+ return SimpleSymbolReferenceType.Library;
+ }
+ return SimpleSymbolReferenceType.Undefined;
+ }
+ }
+
+ string ISimpleSymbolLibraryReference.ResourceId
+ {
+ get
+ {
+ return (string)this.Item;
+ }
+ set
+ {
+ if (!ResourceIdentifier.Validate(value))
+ throw new InvalidOperationException("Not a valid resource identifier"); //LOCALIZE
+
+ var res = new ResourceIdentifier(value);
+ if (res.Extension != ResourceTypes.SymbolDefinition.ToString())
+ throw new InvalidOperationException("Invalid resource identifier for this type of object: " + res.Extension); //LOCALIZE
+
+ this.Item = value;
+ OnPropertyChanged("ResourceId");
+ }
+ }
+ }
+
+ partial class ImageReference : ISymbolLibraryReference
+ {
+ SymbolInstanceType ISymbolInstanceReference.Type
+ {
+ get { return SymbolInstanceType.Reference; }
+ }
+ }
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolInterfaces.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/SymbolInterfaces.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -21,6 +21,7 @@
using System.Collections.Generic;
using System.Text;
using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using OSGeo.MapGuide.MaestroAPI.Resource;
namespace OSGeo.MapGuide.ObjectModels.SymbolDefinition
{
@@ -154,7 +155,7 @@
/// <summary>
/// Base interface of all symbol definitions
/// </summary>
- public interface ISymbolDefinitionBase
+ public interface ISymbolDefinitionBase : IResource
{
/// <summary>
/// Gets or sets the name.
@@ -178,19 +179,19 @@
/// Gets the graphics.
/// </summary>
/// <value>The graphics.</value>
- IEnumerable<IGraphics> Graphics { get; }
+ IEnumerable<IGraphicBase> Graphics { get; }
/// <summary>
/// Adds the graphics.
/// </summary>
/// <param name="graphics">The graphics.</param>
- void AddGraphics(IGraphics graphics);
+ void AddGraphics(IGraphicBase graphics);
/// <summary>
/// Removes the graphics.
/// </summary>
/// <param name="graphics">The graphics.</param>
- void RemoveGraphics(IGraphics graphics);
+ void RemoveGraphics(IGraphicBase graphics);
/// <summary>
/// Gets or sets the resize box.
@@ -326,12 +327,12 @@
/// <summary>
/// Specifies the horizontal offset to apply to the symbol origin, in mm. This offset is applied before the symbol is scaled and rotated. Defaults to 0
/// </summary>
- double OriginOffsetX { get; set; }
+ double? OriginOffsetX { get; set; }
/// <summary>
/// Specifies the vertical offset to apply to the symbol origin, in mm. This offset is applied before the symbol is scaled and rotated. Defaults to 0
/// </summary>
- double OriginOffsetY { get; set; }
+ double? OriginOffsetY { get; set; }
}
/// <summary>
@@ -600,7 +601,7 @@
/// Gets or sets the type of the data.
/// </summary>
/// <value>The type of the data.</value>
- DataType DataType { get; set; }
+ string DataType { get; set; }
}
/// <summary>
@@ -681,7 +682,11 @@
/// <summary>
/// Inlined definition
/// </summary>
- Inline
+ Inline,
+ /// <summary>
+ /// Undefined
+ /// </summary>
+ Undefined
}
/// <summary>
@@ -1271,5 +1276,30 @@
#endregion
#region Symbol Definition 1.1.0 interfaces
+ /// <summary>
+ /// An extension of the text element to support rich text
+ /// </summary>
+ public interface IText2 : IText
+ {
+ /// <summary>
+ /// Gets or sets the type of rich text markup used to render the contents
+ /// </summary>
+ string Markup { get; set; }
+
+ /// <summary>
+ /// Gets or sets the text style attribute to create a line that runs on top of the text
+ /// </summary>
+ string Overlined { get; set; }
+
+ /// <summary>
+ /// Gets or sets the skew of shear angle to be applied to the text
+ /// </summary>
+ string ObliqueAngle { get; set; }
+
+ /// <summary>
+ /// Gets or sets the width scale applied to inter character spacing independent of the font character spacing
+ /// </summary>
+ string TrackSpacing { get; set; }
+ }
#endregion
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Properties/Resources.Designer.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Properties/Resources.Designer.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -917,6 +917,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to Unknown Symbol Definition version: .
+ /// </summary>
+ internal static string UnknownSymbolDefVersion {
+ get {
+ return ResourceManager.GetString("UnknownSymbolDefVersion", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Unknown web layout version: .
/// </summary>
internal static string UnknownWebLayoutVersion {
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Properties/Resources.resx
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Properties/Resources.resx 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Properties/Resources.resx 2011-03-09 13:17:54 UTC (rev 5614)
@@ -482,4 +482,7 @@
<data name="BaseTemplate_ApplicationDefinition" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\BaseTemplate.ApplicationDefinition.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
+ <data name="UnknownSymbolDefVersion" xml:space="preserve">
+ <value>Unknown Symbol Definition version: </value>
+ </data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ResourceTypeRegistry.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ResourceTypeRegistry.cs 2011-03-09 07:23:41 UTC (rev 5613)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ResourceTypeRegistry.cs 2011-03-09 13:17:54 UTC (rev 5614)
@@ -159,13 +159,13 @@
var node = doc.SelectSingleNode("//SimpleSymbolDefinition");
if (node != null)
{
- return SimpleSymbolDefinition.Deserialize(xml);
+ return OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_0_0.SimpleSymbolDefinition.Deserialize(xml);
}
else
{
node = doc.SelectSingleNode("//CompoundSymbolDefinition");
if (node != null)
- return CompoundSymbolDefinition.Deserialize(xml);
+ return OSGeo.MapGuide.ObjectModels.SymbolDefinition_1_0_0.CompoundSymbolDefinition.Deserialize(xml);
else //WTF?
throw new SerializationException("Could not determine symbol type"); //LOCALIZE
}
More information about the mapguide-commits
mailing list