[mapguide-commits] FW: r5932 - in trunk/Tools/Maestro: ExtendedModels ExtendedModels/LayerDefinition-2.3.0 ExtendedModels/MapDefinition-2.3.0 ExtendedModels/WatermarkDefinition-2.3.0 ExtendedModels/WatermarkDefinition-2.3.0/Properties Generated Maestro Maestro.Base Maestro.

Tom Fukushima tom.fukushima at autodesk.com
Fri Jun 17 17:41:48 EDT 2011



-----Original Message-----
From: svn_mapguide at osgeo.org [mailto:svn_mapguide at osgeo.org] 
Sent: Friday, June 17, 2011 11:00 AM
To: mapguide-commits at lists.osgeo.org
Subject: r5932 - in trunk/Tools/Maestro: ExtendedModels ExtendedModels/LayerDefinition-2.3.0 ExtendedModels/MapDefinition-2.3.0 ExtendedModels/WatermarkDefinition-2.3.0 ExtendedModels/WatermarkDefinition-2.3.0/Properties Generated Maestro Maestro.Base Maestro.B...

Author: jng
Date: 2011-06-17 10:00:11 -0700 (Fri, 17 Jun 2011)
New Revision: 5932

Added:
   trunk/Tools/Maestro/ExtendedModels/WatermarkDefinition-2.3.0/
   trunk/Tools/Maestro/ExtendedModels/WatermarkDefinition-2.3.0/OSGeo.MapGuide.ObjectModels.WatermarkDefinition-2.3.0.csproj
   trunk/Tools/Maestro/ExtendedModels/WatermarkDefinition-2.3.0/Properties/
   trunk/Tools/Maestro/ExtendedModels/WatermarkDefinition-2.3.0/Properties/AssemblyInfo.cs
   trunk/Tools/Maestro/ExtendedModels/WatermarkDefinition-2.3.0/Properties/Resources.Designer.cs
   trunk/Tools/Maestro/ExtendedModels/WatermarkDefinition-2.3.0/Properties/Resources.resx
   trunk/Tools/Maestro/ExtendedModels/WatermarkDefinition-2.3.0/WatermarkImpl.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceSettingsCtrl.resx
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.resx
   trunk/Tools/Maestro/Maestro.Editors/Resources/arrow.png
   trunk/Tools/Maestro/Maestro.Editors/Resources/edit.png
   trunk/Tools/Maestro/Maestro.Editors/Resources/image.png
   trunk/Tools/Maestro/Maestro.Editors/Resources/layer-shape-curve.png
   trunk/Tools/Maestro/Maestro.Editors/Resources/marker.png
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/AdvancedSettingsCtrl.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/AdvancedSettingsCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/AdvancedSettingsCtrl.resx
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/CompoundSymbolDefinitionEditorCtrl.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/CompoundSymbolDefinitionEditorCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/CompoundSymbolDefinitionEditorCtrl.resx
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GeneralSettingsCtrl.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GeneralSettingsCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GeneralSettingsCtrl.resx
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.resx
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/PathDialog.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/PathDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/PathDialog.resx
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/TextDialog.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/TextDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/TextDialog.resx
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/ParameterSelector.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/ParameterSelector.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/ParameterSelector.resx
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/ParametersCtrl.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/ParametersCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/ParametersCtrl.resx
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolDefinitionDialog.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolDefinitionDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolDefinitionDialog.resx
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolDefinitionEditorCtrl.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolDefinitionEditorCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolDefinitionEditorCtrl.resx
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolReferenceCtrl.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolReferenceCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolReferenceCtrl.resx
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolEditorService.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolField.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolField.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolField.resx
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolGraphicsCtrl.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolGraphicsCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolGraphicsCtrl.resx
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolParameterDialog.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolParameterDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolParameterDialog.resx
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolParameterEditor.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolParameterEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolParameterEditor.resx
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/UsageContextsCtrl.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/UsageContextsCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/UsageContextsCtrl.resx
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/NsDoc.cs
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/TilePositionEditor.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/TilePositionEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/TilePositionEditor.resx
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkCollectionEditorCtrl.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkCollectionEditorCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkCollectionEditorCtrl.resx
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkEditorCtrl.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkEditorCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkEditorCtrl.resx
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditor.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditor.resx
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditorDialog.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditorDialog.cs
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditorDialog.resx
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/XYPositionEditor.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/XYPositionEditor.cs
   trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/XYPositionEditor.resx
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/CommonTypes.cs
Modified:
   trunk/Tools/Maestro/ExtendedModels/LayerDefinition-2.3.0/OSGeo.MapGuide.ObjectModels.LayerDefinition-2.3.0.csproj
   trunk/Tools/Maestro/ExtendedModels/MapDefinition-2.3.0/OSGeo.MapGuide.ObjectModels.MapDefinition-2.3.0.csproj
   trunk/Tools/Maestro/Generated/FeatureSource-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/LayerDefinition-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/SymbolDefinition-1.0.0.designer.cs
   trunk/Tools/Maestro/Generated/SymbolDefinition-1.1.0.designer.cs
   trunk/Tools/Maestro/Generated/WatermarkDefinition-2.3.0.designer.cs
   trunk/Tools/Maestro/Maestro.Base/Commands/StartupCommand.cs
   trunk/Tools/Maestro/Maestro.Base/Editor/LayerDefinitionEditor.cs
   trunk/Tools/Maestro/Maestro.Base/Editor/ResourceEditorService.cs
   trunk/Tools/Maestro/Maestro.Base/Editor/SymbolDefinitionEditor.cs
   trunk/Tools/Maestro/Maestro.Base/Maestro.Base.addin
   trunk/Tools/Maestro/Maestro.Base/Services/NewItemTemplateService.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/EditorBindableCollapsiblePanel.cs
   trunk/Tools/Maestro/Maestro.Editors/EditorBase.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/FeaturePreviewRender.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/ScaleRangeConditions.designer.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/ScaleRangeConditions.resx
   trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj
   trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx
   trunk/Tools/Maestro/Maestro/Maestro_All.sln
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerFactory.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerInterfaces.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/MapDefinition.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/MapDefinitionInterfaces.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/ObjectModels/VectorLayerDefinitionImpl.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/WatermarkInterfaces.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/DataPropertyDefinition.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/GeometricPropertyDefinition.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/PropertyDefinition.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Schema/RasterPropertyDefinition.cs
Log:
This submission contains the following changes:
 * #1714: Submit work in progress for the Symbol Definition editor
 * #1707: Submit work in progress for the Watermark Definition editor
 * #1718: Only check for W2D symbol if PointSymbolization2D element is defined
 * #1721: Fix > 1.0.0 resource templates not being picked up on startup




More information about the mapguide-commits mailing list