[mapguide-commits] r5962 - in trunk/Tools/Maestro:
ExtendedModels/WatermarkDefinition-2.3.0 Generated
Maestro.Editors/Common Maestro.Editors/MapDefinition
Maestro.Editors/WatermarkDefinition OSGeo.MapGuide.MaestroAPI
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Jun 30 12:33:47 EDT 2011
Author: jng
Date: 2011-06-30 09:33:47 -0700 (Thu, 30 Jun 2011)
New Revision: 5962
Modified:
trunk/Tools/Maestro/ExtendedModels/WatermarkDefinition-2.3.0/WatermarkImpl.cs
trunk/Tools/Maestro/Generated/WatermarkDefinition-2.3.0.designer.cs
trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.cs
trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.resx
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapDefinitionEditorCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkCollectionEditorCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditor.cs
trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkSettingsCtrl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/XmlValidator.cs
Log:
#1707:
* More work on Watermark editor.
* Fix some defects on the Watermark instance editor
* Add Resource Picker icon for Watermarks.
* Update the generic XML validator to consider the updated xsd dependency chains introduced by the Watermark Definition schema.
Modified: trunk/Tools/Maestro/ExtendedModels/WatermarkDefinition-2.3.0/WatermarkImpl.cs
===================================================================
--- trunk/Tools/Maestro/ExtendedModels/WatermarkDefinition-2.3.0/WatermarkImpl.cs 2011-06-30 15:57:53 UTC (rev 5961)
+++ trunk/Tools/Maestro/ExtendedModels/WatermarkDefinition-2.3.0/WatermarkImpl.cs 2011-06-30 16:33:47 UTC (rev 5962)
@@ -233,11 +233,21 @@
{
get
{
- return this.PositionOverride.Item;
+ return this.PositionOverride == null ? null : this.PositionOverride.Item;
}
set
{
- this.PositionOverride.Item = (PositionType)value;
+ if (value == null)
+ {
+ this.PositionOverride = null;
+ }
+ else
+ {
+ if (this.PositionOverride == null)
+ this.PositionOverride = new WatermarkTypePositionOverride();
+
+ this.PositionOverride.Item = (PositionType)value;
+ }
}
}
@@ -271,7 +281,13 @@
public ITilePosition CreateDefaultTilePosition()
{
- throw new NotImplementedException();
+ return new TilePositionType()
+ {
+ VerticalPosition = new VerticalPositionType(),
+ HorizontalPosition = new HorizontalPositionType(),
+ TileHeight = 200,
+ TileWidth = 200
+ };
}
}
Modified: trunk/Tools/Maestro/Generated/WatermarkDefinition-2.3.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/WatermarkDefinition-2.3.0.designer.cs 2011-06-30 15:57:53 UTC (rev 5961)
+++ trunk/Tools/Maestro/Generated/WatermarkDefinition-2.3.0.designer.cs 2011-06-30 16:33:47 UTC (rev 5962)
@@ -2311,9 +2311,6 @@
private static System.Xml.Serialization.XmlSerializer serializer;
public WatermarkType() {
- this.extendedData1Field = new ExtendedDataType();
- this.positionOverrideField = new WatermarkTypePositionOverride();
- this.appearanceOverrideField = new WatermarkAppearanceType();
this.usageField = UsageType.All;
}
Modified: trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.Designer.cs 2011-06-30 15:57:53 UTC (rev 5961)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.Designer.cs 2011-06-30 16:33:47 UTC (rev 5962)
@@ -96,6 +96,7 @@
this.resImageList.Images.SetKeyName(7, "blueprints.png");
this.resImageList.Images.SetKeyName(8, "applications-stack.png");
this.resImageList.Images.SetKeyName(9, "marker.png");
+ this.resImageList.Images.SetKeyName(10, "edit.png");
//
// btnOK
//
Modified: trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.cs 2011-06-30 15:57:53 UTC (rev 5961)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.cs 2011-06-30 16:33:47 UTC (rev 5962)
@@ -48,6 +48,7 @@
const int RES_DRAWINGSOURCE = 7;
const int RES_APPLICATIONDEFINITION = 8;
const int RES_SYMBOLDEFINITION = 9;
+ const int RES_WATERMARK = 10;
private ResourceTypes[] _resTypes;
@@ -361,6 +362,9 @@
case ResourceTypes.SymbolDefinition:
li.ImageIndex = RES_SYMBOLDEFINITION;
break;
+ case ResourceTypes.WatermarkDefinition:
+ li.ImageIndex = RES_WATERMARK;
+ break;
default:
li.ImageIndex = RES_UNKNOWN;
break;
Modified: trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.resx 2011-06-30 15:57:53 UTC (rev 5961)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.resx 2011-06-30 16:33:47 UTC (rev 5962)
@@ -128,8 +128,8 @@
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
- ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2
- EgAAAk1TRnQBSQFMAgEBCgEAAdgBAAHYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADo
+ EwAAAk1TRnQBSQFMAgEBCwEAAeABAAHgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -158,13 +158,16 @@
AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wEAAfAIBwG8Af8IAAL/
- AfQBBwFvAQcB8wL/JAABvAjzAbwB/wgAA/8BbwEXAW8D/yQAAfAB9AbzAfQB8AwAAW8B4wFvJwAB8AH/
- BvQB/wG8A/8JAAFvAeMBbycAAfEI/wGSAgcB8AgAAf8BbwHjAW8B/yYAAfACBwPvAvcBkgHsAvMBvAgA
- ARoBbwHjAW8BGiYAAfEB8AHxAfABvAEHA7wB7wHzAfQB8AcAAf8CbwHjAm8B/yUAAfQB8gHxBe8BBwHy
- AfQB/wG8A/8EAAEaAW8D4wFvARooAAHxCP8BkgIHAfADAAH/AW8BFgPjARYBbwH/JwAB8AIHA+8C9wGS
- AewC8wG8AwABGgIWA+MCFgEaJwAB8QHwAfEB8AG8AQcDvAHvAfMB9AHwAwABkwEWAeMBbgEUAW4B4wEW
- AZMnAAH0AfIB8QXvAQcB8gH0Af8B8AMAARYBlAEWAxMBFgGUARYqAAHxCP8B8QMAApQBFgFuARIBbgEW
- ApQqAAHwAgcD7wL3AZIBvAMAARoHFgEaKgAB8QHwAfEB8AG8AQcDvAHxAwAB/wGUARYDlAEWAZQB/yoA
+ AfQBBwFvAQcB8wL/BgAM/xIAAbwI8wG8Af8IAAP/AW8BFwFvA/8GAAL/AW0GEAFtAfQB/xIAAfAB9Abz
+ AfQB8AwAAW8B4wFvCwABEQPqAhIB6gERFAAB8AH/BvQB/wG8A/8JAAFvAeMBbwsAAewBQwEUAhIBFAFD
+ AewUAAHxCP8BkgIHAfAIAAH/AW8B4wFvAf8LAAHzARQCEgEUAfMVAAHwAgcD7wL3AZIB7ALzAbwIAAEa
+ AW8B4wFvARoMAAETAhIBExYAAfEB8AHxAfABvAEHA7wB7wHzAfQB8AcAAf8CbwHjAm8B/wsABBIWAAH0
+ AfIB8QXvAQcB8gH0Af8BvAP/BAABGgFvA+MBbwEaCwAB6gITAeoZAAHxCP8BkgIHAfADAAH/AW8BFgPj
+ ARYBbwH/CgABbQITAW0ZAAHwAgcD7wL3AZIB7ALzAbwDAAEaAhYD4wIWARoKAAFtAhIBbRkAAfEB8AHx
+ AfABvAEHA7wB7wHzAfQB8AMAAZMBFgHjAW4BFAFuAeMBFgGTBQAB7wHrAfECAAHrAuoB6wIAAfEB6wHv
+ FAAB9AHyAfEF7wEHAfIB9AH/AfADAAEWAZQBFgMTARYBlAEWBQAB6wH4AesCAAHrAm0B6wIAAesBbQHr
+ FwAB8Qj/AfEDAAKUARYBbgESAW4BFgKUBQAC+AFtA/gC6wP4ARIBbQH4FwAB8AIHA+8C9wGSAbwDAAEa
+ BxYBGgUAAfgE7AT4BOsB+BcAAfEB8AHxAfABvAEHA7wB8QMAAf8BlAEWA5QBFgGUAf8FAAHvDOwB7xcA
AfQB8gbxAfIB9AQAAf8BGgGUARYBlAEaAf81AAz/BwABvAgHAbwDAAH0AbUItAG1AfQEABD/AbwKBwG8
BAAD/wEHCP8BBwT/AbQB3AEZBNsBCQHcAbQB/wQAAbwC7wyuAbUBvAH/CPQB/wEHAv8CAAEHA+8B8gGz
AQkBuwJsAYsB8gPvAQcBAAG0AhkBCQEZAgkBGQEJAbQF/wEHAfMB8gGLCbMB1QGtAZEBvAH0BCoBMAE3
@@ -201,15 +204,17 @@
AwAB8AH/AvQC8wLxAe8B/wHwAfQGAAHxAfIBvAEHAe8C9wEHAbwB8wHwAgAB8wHyCvQB8gHzAQAB8AH/
AXgBmAKZAQgCuwO6AbQB/wHwAwAB8QL/BfQBBwHxAfQHAAHxAfMB8QHwAbwCBwG8AfAB8wHwAgAB/wHz
CvIB8wH/AQAB8Q3/AfEDAAHzCPIB9AgAAfIJ8QHyEQAB8w3yAfMBAAFCAU0BPgcAAT4DAAEoAwABQAMA
- ATADAAEBAQABAQUAAYABARYAA/8CAAEfAeABDwUAAR8B4AEPBQABPwH8AX8FAAEHAfwBfwUAAQcB+AE/
- BQABBwH4AT8FAAEHAfABHwYAAfABHwQAAeABAAHgAQ8EAAHgAQAB4AEPBAAB4AEAAeABDwQAAeABAAHg
- AQ8EAAH8AQAB4AEPBAAB/AEAAeABDwQAAfwBAAHgAQ8EAAH8AQAB8AEfBAAC/wEAAQ8B4AEHAQABDwMA
- AQ8DAAEPAwABAwIAAYAEAAEDAgABgAcAAYABAQYAAYABAQYAAYABAQYAAYABAQYAAYABAQYAAYABAQYA
- AYABAQIAAcABAAHgAQcBgAEBAgABwAEAAeABBwGAAQECAAHwAQAB4AEHAfgBAQIAAfABAAHgAQ8B+AED
- BP8B4AEfAfgBBwcAAQEDAAEBAwABAQHAAQMCAAGAAQEBAAEBAcABAwIAAYABAQEAAQEBwAEDAgABgAEB
- AQABAQHAAQMBAAEBAYABAQEAAQEBwAEDAQABAQGAAQEBAAEBAcABAwHwAQEBgAEBAQABAQHAAQMB8AEB
- AYABAQEAAQEBwAEDAfABAQGAAQEBAAEBAcABAwHwAQEBgAEBAQABAQHAAQMB8AEBAYABAQEAAQEBwAED
- AfABAQGAAQEBAAEBAcABAwHwAQEBgAEBAQABAQHAAQcB8AEBAYABAQEAAQEBwAEPAfABAQL/AQABAQs=
+ ATADAAEBAQABAQUAAYABARYAA/8CAAEfAeABDwHAAQMDAAEfAeABDwHAAQMDAAE/AfwBfwHwAQ8DAAEH
+ AfwBfwHwAQ8DAAEHAfgBPwH4AR8DAAEHAfgBPwH8AT8DAAEHAfABHwH8AT8EAAHwAR8B/AE/AgAB4AEA
+ AeABDwH8AT8CAAHgAQAB4AEPAfwBPwIAAeABAAHgAQ8BjAExAgAB4AEAAeABDwGMATECAAH8AQAB4AEP
+ AYABAQIAAfwBAAHgAQ8BgAEBAgAB/AEAAeABDwGAAQECAAH8AQAB8AEfAv8CAAL/AQABDwHgAQcBAAEP
+ AwABDwMAAQ8DAAEDAgABgAQAAQMCAAGABwABgAEBBgABgAEBBgABgAEBBgABgAEBBgABgAEBBgABgAEB
+ BgABgAEBAgABwAEAAeABBwGAAQECAAHAAQAB4AEHAYABAQIAAfABAAHgAQcB+AEBAgAB8AEAAeABDwH4
+ AQME/wHgAR8B+AEHBwABAQMAAQEDAAEBAcABAwIAAYABAQEAAQEBwAEDAgABgAEBAQABAQHAAQMCAAGA
+ AQEBAAEBAcABAwEAAQEBgAEBAQABAQHAAQMBAAEBAYABAQEAAQEBwAEDAfABAQGAAQEBAAEBAcABAwHw
+ AQEBgAEBAQABAQHAAQMB8AEBAYABAQEAAQEBwAEDAfABAQGAAQEBAAEBAcABAwHwAQEBgAEBAQABAQHA
+ AQMB8AEBAYABAQEAAQEBwAEDAfABAQGAAQEBAAEBAcABBwHwAQEBgAEBAQABAQHAAQ8B8AEBAv8BAAEB
+ Cw==
</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
@@ -473,50 +478,50 @@
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
- ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAA
- CgAAAk1TRnQBSQFMAgEBAgEAASABAAEgAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
+ CQAAAk1TRnQBSQFMAgEBAgEAASgBAAEoAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABEAMAAQEBAAEgBgABEBYAAwcBCgMSARgDEwEaAxMBGgMTARoDEwEaAxMBGgMTARoDEwEaAxMBGgMT
- ARoDEwEaAxIBGAMIAQvIAAMOARMDPAFnA04BpANOAaQDTgGkA04BpANOAaQDTgGkA04BpANOAaQDTgGk
- A04BpAM8AWgDEAEVBAADBAEGAxABFgMTARoDEwEaAxMBGgMTARoDEwEaAxMBGgMTARoDEwEaAxMBGgMT
+ ARoDEwEaAxIBGAMIAQvIAAMOARMDPAFnA1ABpANQAaQDUAGkA1ABpANQAaQDUAGkA1ABpANQAaQDUAGk
+ A1ABpAM8AWgDEAEVBAADBAEGAxABFgMTARoDEwEaAxMBGgMTARoDEwEaAxMBGgMTARoDEwEaAxMBGgMT
ARoDEwEaAxMBGgMQARYDBAEGiAADGgElA0sBjgOGAf8DggH/A4IB/wOCAf8DggH/A4IB/wOCAf8DhgH/
- A0sBjgMaASUIAAFLAUwBTQGRAVEBWgFfAb0BUQFaAV8BvQFRAVoBXwG9AVEBWgFfAb0BUQFaAV8BvQFR
- AVoBXwG9AVEBWgFfAb0BUQFaAV8BvQFRAVoBXwG9AVEBWgFfAb0BUQFaAV8BvQFRAVoBXwG9AVEBWgFf
- Ab0BUQFaAV8BvQFLAUwBTQGRjAADTAGTA2kB/wNlAf8DZQH/A2UB/wNlAf8DZQH/AS8BzAEvAf8DaQH/
- A0wBkwwAAVABVQFYAbABhgHPAfAB/wGCAcsB7QH/AYIBywHtAf8BggHLAe0B/wGCAcsB7QH/AYIBywHt
- Af8BggHLAe0B/wGCAcsB7QH/AYIBywHtAf8BggHLAe0B/wGCAcsB7QH/AYIBywHtAf8BggHLAe0B/wGG
- Ac8B8AH/AVABVQFYAbCMAANPAagDUQH/A1EB/wNRAf8DUQH/A1EB/wNRAf8DUQH/A1EB/wNPAagMAAFP
- AVIBVAGiAYYBzwHuAf8BeQHIAegB/wF5AcgB6AH/AXkByAHoAf8BeQHIAegB/wF5AcgB6AH/AXkByAHo
- Af8BeQHIAegB/wF5AcgB6AH/AXkByAHoAf8BeQHIAegB/wF5AcgB6AH/AXkByAHoAf8BhgHPAe4B/wFP
- AVIBVAGijAADRQF+A8cB/wO9Af8DvQH/A70B/wO9Af8DvQH/A70B/wPHAf8DRQF+DAABTQFQAVIBnQGK
- AdMB8AH/AYIBzAHrAf8BggHMAesB/wGCAcwB6wH/AYIBzAHrAf8BggHMAesB/wGCAcwB6wH/AYIBzAHr
- Af8BggHMAesB/wGCAcwB6wH/AYIBzAHrAf8BggHMAesB/wGCAcwB6wH/AYoB0wHwAf8BTQFQAVIBnYwA
- A0MBeAPKAf8DwAH/A8AB/wPAAf8DwAH/A8AB/wPSAf8DygH/A0MBeAwAAU0BTgFQAZkBjwHXAfIB/wGH
- AdAB7QH/AYcB0AHtAf8BhwHQAe0B/wGHAdAB7QH/AYcB0AHtAf8BhwHQAe0B/wGHAdAB7QH/AYcB0AHt
- Af8BhwHQAe0B/wGHAdAB7QH/AYcB0AHtAf8BhwHQAe0B/wGPAdcB8gH/AU0BTgFQAZmMAANCAXUDzQH/
- A8MB/wPDAf8DwwH/A8MB/wPDAf8DmQH/A80B/wNCAXUMAAFNAU4BTwGVAZQB2wH0Af8BjQHVAfAB/wGN
- AdUB8AH/AY0B1QHwAf8BjQHVAfAB/wGNAdUB8AH/AY0B1QHwAf8BjQHVAfAB/wGNAdUB8AH/AY0B1QHw
- Af8BjQHVAfAB/wGNAdUB8AH/AY0B1QHwAf8BlAHbAfQB/wFNAU4BTwGVjAADQQFzA9YB/wPRAf8D0QH/
- A9EB/wPRAf8D0QH/A9EB/wPWAf8DQQFzDAABSwFNAU4BkgGZAeAB9gH/AZIB2gHzAf8BkgHaAfMB/wGS
- AdoB8wH/AZIB2gHzAf8BkgHaAfMB/wGSAdoB8wH/AZIB2gHzAf8BkgHaAfMB/wGSAdoB8wH/AZIB2gHz
- Af8BkgHaAfMB/wGSAdoB8wH/AZkB4AH2Af8BSwFNAU4BkowAA0ABcQO3Af8DuwH/A7sB/wO7Af8DuwH/
- A7sB/wO7Af8DtwH/A0ABcQwAAUsBTAFNAY4BnwHlAfkB/wGYAd8B9gH/AZgB3wH2Af8BmAHfAfYB/wGY
- Ad8B9gH/AZgB3wH2Af8BmAHfAfYB/wGYAd8B9gH/AZgB3wH2Af8BmAHfAfYB/wGYAd8B9gH/AZgB3wH2
- Af8BmAHfAfYB/wGfAeUB+QH/AUsBTAFNAY6MAANAAW8D2QH/A88B/wPPAf8DzwH/A88B/wPPAf8DzwH/
- A9kB/wNAAW8MAAFJAUoBSwGLAaMB6QH7Af8BnQHjAfkB/wGdAeMB+QH/AZ0B4wH5Af8BnQHjAfkB/wGd
- AeMB+QH/AZ0B4wH5Af8BowHpAfoB/wGjAekB+gH/AaMB6QH6Af8BowHpAfoB/wGjAekB+gH/AaMB6QH6
- Af8BpgHsAfsB/wFJAUoBSwGLjAADPwFtA+EB/wPcAf8D3AH/A9wB/wPcAf8D3AH/A9wB/wPhAf8DPwFt
- DAABSAJJAYgBqAHtAf0B/wGiAecB+wH/AaIB5wH7Af8BogHnAfsB/wGiAecB+wH/AaIB5wH7Af8BqwHw
- Af0B/wGFAcoB5gH/AXQBvAHeAf8BdAG8Ad4B/wF0AbwB3gH/AXQBvAHeAf8BdAG8Ad4B/wF0AbwB3gH/
- AUgCSQGIjAADPgFrA8EB/wPGAf8DxgH/A8YB/wPGAf8DxgH/A8YB/wPBAf8DPgFrDAACSAFJAYUBrgHz
- Av8BqwHwAf4B/wGrAfAB/gH/AasB8AH+Af8BqwHwAf4B/wGuAfMC/wGJAc0B6QH/AYkBzQHpAf8BqwHw
- Af4B/wGrAfAB/gH/AasB8AH+Af8BqwHwAf4B/wGrAfAB/gH/Aa4B8wL/AkgBSQGFjAADPQFpA+MB/wPa
- Af8D2gH/A9oB/wPaAf8D2gH/A9oB/wPjAf8DPQFpDAADOwFjAUcCSAGDAUcCSAGDAUcCSAGDAUcCSAGD
- AUcCSAGDAUcCSAGDAUcCSAGDAv4B/QH/AvgB8wH/AvAB5gH/AukB2wH/Af4ByQE9Af8B9AG2ASoB/wFH
- AkgBgwM7AWOMAAM9AWgD6gH/A+UB/wPlAf8D5QH/A+UB/wPlAf8D5QH/A+oB/wM9AWgoAAMgAS4BRgJH
- AYEBRgJHAYEBRgJHAYEBRgJHAYEBRgJHAYEBRgJHAYEDIAEukAADMQFNAz0BZwM9AWcDPQFnAz0BZwM9
- AWcDPQFnAz0BZwM9AWcDMQFNzAABQgFNAT4HAAE+AwABKAMAAUADAAEQAwABAQEAAQEFAAGAFwAD/wEA
- AYABAQL/BAABgAEBBgABwAEDBgAB4AEHBgAB4AEHBgAB4AEHBgAB4AEHBgAB4AEHBgAB4AEHBgAB4AEH
- BgAB4AEHBgAB4AEHBgAB4AEHBgAB4AEHBgAB4AEHAf4BAQQAAeABBwL/BAAL
+ A0sBjgMaASUIAAJMAU0BkQFUAVoBXAG9AVQBWgFcAb0BVAFaAVwBvQFUAVoBXAG9AVQBWgFcAb0BVAFa
+ AVwBvQFUAVoBXAG9AVQBWgFcAb0BVAFaAVwBvQFUAVoBXAG9AVQBWgFcAb0BVAFaAVwBvQFUAVoBXAG9
+ AVQBWgFcAb0CTAFNAZGMAANMAZMDaAH/A2QB/wNkAf8DZAH/A2QB/wNkAf8BLgHMAS4B/wNoAf8DTAGT
+ DAABUgFVAVYBsAGGAc8B8AH/AYIBywHtAf8BggHLAe0B/wGCAcsB7QH/AYIBywHtAf8BggHLAe0B/wGC
+ AcsB7QH/AYIBywHtAf8BggHLAe0B/wGCAcsB7QH/AYIBywHtAf8BggHLAe0B/wGCAcsB7QH/AYYBzwHw
+ Af8BUgFVAVYBsIwAA1ABqANQAf8DUAH/A1AB/wNQAf8DUAH/A1AB/wNQAf8DUAH/A1ABqAwAAVABUQFS
+ AaIBhgHPAe4B/wF4AcgB6AH/AXgByAHoAf8BeAHIAegB/wF4AcgB6AH/AXgByAHoAf8BeAHIAegB/wF4
+ AcgB6AH/AXgByAHoAf8BeAHIAegB/wF4AcgB6AH/AXgByAHoAf8BeAHIAegB/wGGAc8B7gH/AVABUQFS
+ AaKMAANFAX4DxwH/A70B/wO9Af8DvQH/A70B/wO9Af8DvQH/A8cB/wNFAX4MAAFPAlABnQGKAdMB8AH/
+ AYIBzAHrAf8BggHMAesB/wGCAcwB6wH/AYIBzAHrAf8BggHMAesB/wGCAcwB6wH/AYIBzAHrAf8BggHM
+ AesB/wGCAcwB6wH/AYIBzAHrAf8BggHMAesB/wGCAcwB6wH/AYoB0wHwAf8BTwJQAZ2MAANDAXgDygH/
+ A8AB/wPAAf8DwAH/A8AB/wPAAf8D0gH/A8oB/wNDAXgMAANOAZkBjwHXAfIB/wGHAdAB7QH/AYcB0AHt
+ Af8BhwHQAe0B/wGHAdAB7QH/AYcB0AHtAf8BhwHQAe0B/wGHAdAB7QH/AYcB0AHtAf8BhwHQAe0B/wGH
+ AdAB7QH/AYcB0AHtAf8BhwHQAe0B/wGPAdcB8gH/A04BmYwAA0IBdQPNAf8DwwH/A8MB/wPDAf8DwwH/
+ A8MB/wOZAf8DzQH/A0IBdQwAAU0CTgGVAZQB2wH0Af8BjQHVAfAB/wGNAdUB8AH/AY0B1QHwAf8BjQHV
+ AfAB/wGNAdUB8AH/AY0B1QHwAf8BjQHVAfAB/wGNAdUB8AH/AY0B1QHwAf8BjQHVAfAB/wGNAdUB8AH/
+ AY0B1QHwAf8BlAHbAfQB/wFNAk4BlYwAA0EBcwPWAf8D0QH/A9EB/wPRAf8D0QH/A9EB/wPRAf8D1gH/
+ A0EBcwwAAkwBTQGSAZkB4AH2Af8BkgHaAfMB/wGSAdoB8wH/AZIB2gHzAf8BkgHaAfMB/wGSAdoB8wH/
+ AZIB2gHzAf8BkgHaAfMB/wGSAdoB8wH/AZIB2gHzAf8BkgHaAfMB/wGSAdoB8wH/AZIB2gHzAf8BmQHg
+ AfYB/wJMAU0BkowAA0ABcQO3Af8DuwH/A7sB/wO7Af8DuwH/A7sB/wO7Af8DtwH/A0ABcQwAAksBTAGO
+ AZ8B5QH5Af8BmAHfAfYB/wGYAd8B9gH/AZgB3wH2Af8BmAHfAfYB/wGYAd8B9gH/AZgB3wH2Af8BmAHf
+ AfYB/wGYAd8B9gH/AZgB3wH2Af8BmAHfAfYB/wGYAd8B9gH/AZgB3wH2Af8BnwHlAfkB/wJLAUwBjowA
+ A0ABbwPZAf8DzwH/A88B/wPPAf8DzwH/A88B/wPPAf8D2QH/A0ABbwwAA0oBiwGjAekB+wH/AZ0B4wH5
+ Af8BnQHjAfkB/wGdAeMB+QH/AZ0B4wH5Af8BnQHjAfkB/wGdAeMB+QH/AaMB6QH6Af8BowHpAfoB/wGj
+ AekB+gH/AaMB6QH6Af8BowHpAfoB/wGjAekB+gH/AaYB7AH7Af8DSgGLjAADPwFtA+EB/wPcAf8D3AH/
+ A9wB/wPcAf8D3AH/A9wB/wPhAf8DPwFtDAABSAJJAYgBqAHtAf0B/wGiAecB+wH/AaIB5wH7Af8BogHn
+ AfsB/wGiAecB+wH/AaIB5wH7Af8BqwHwAf0B/wGFAcoB5gH/AXMBvAHeAf8BcwG8Ad4B/wFzAbwB3gH/
+ AXMBvAHeAf8BcwG8Ad4B/wFzAbwB3gH/AUgCSQGIjAADPgFrA8EB/wPGAf8DxgH/A8YB/wPGAf8DxgH/
+ A8YB/wPBAf8DPgFrDAADSAGFAa4B8wL/AasB8AH+Af8BqwHwAf4B/wGrAfAB/gH/AasB8AH+Af8BrgHz
+ Av8BiQHNAekB/wGJAc0B6QH/AasB8AH+Af8BqwHwAf4B/wGrAfAB/gH/AasB8AH+Af8BqwHwAf4B/wGu
+ AfMC/wNIAYWMAAM9AWkD4wH/A9oB/wPaAf8D2gH/A9oB/wPaAf8D2gH/A+MB/wM9AWkMAAM7AWMBRwJI
+ AYMBRwJIAYMBRwJIAYMBRwJIAYMBRwJIAYMBRwJIAYMBRwJIAYMC/gH9Af8C+AHzAf8C8AHmAf8C6QHb
+ Af8B/gHJATwB/wH0AbYBKQH/AUcCSAGDAzsBY4wAAz0BaAPqAf8D5QH/A+UB/wPlAf8D5QH/A+UB/wPl
+ Af8D6gH/Az0BaCgAAyABLgFGAkcBgQFGAkcBgQFGAkcBgQFGAkcBgQFGAkcBgQFGAkcBgQMgAS6QAAMx
+ AU0DPQFnAz0BZwM9AWcDPQFnAz0BZwM9AWcDPQFnAz0BZwMxAU3MAAFCAU0BPgcAAT4DAAEoAwABQAMA
+ ARADAAEBAQABAQUAAYAXAAP/AQABgAEBAv8EAAGAAQEGAAHAAQMGAAHgAQcGAAHgAQcGAAHgAQcGAAHg
+ AQcGAAHgAQcGAAHgAQcGAAHgAQcGAAHgAQcGAAHgAQcGAAHgAQcGAAHgAQcGAAHgAQcB/gEBBAAB4AEH
+ Av8EAAs=
</value>
</data>
<data name="trvFolders.Location" type="System.Drawing.Point, System.Drawing">
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapDefinitionEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapDefinitionEditorCtrl.cs 2011-06-30 15:57:53 UTC (rev 5961)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapDefinitionEditorCtrl.cs 2011-06-30 16:33:47 UTC (rev 5962)
@@ -25,6 +25,7 @@
using System.Text;
using System.Windows.Forms;
using OSGeo.MapGuide.ObjectModels.MapDefinition;
+using Maestro.Editors.WatermarkDefinition;
namespace Maestro.Editors.MapDefinition
{
@@ -58,6 +59,20 @@
mapSettingsCtrl.Bind(service);
mapLayersCtrl.Bind(service);
+ var mp2 = _map as IMapDefinition2;
+ if (mp2 != null)
+ {
+ this.Controls.Remove(mapSettingsCtrl);
+ this.Controls.Remove(mapLayersCtrl);
+
+ var wm = new WatermarkCollectionEditorCtrl(service.ResourceService, mp2);
+ wm.Dock = DockStyle.Fill;
+
+ this.Controls.Add(wm);
+ this.Controls.Add(mapLayersCtrl);
+ this.Controls.Add(mapSettingsCtrl);
+ }
+
mapLayersCtrl.RequestLayerOpen += new OpenLayerEventHandler(OnRequestLayerOpen);
}
Modified: trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkCollectionEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkCollectionEditorCtrl.cs 2011-06-30 15:57:53 UTC (rev 5961)
+++ trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkCollectionEditorCtrl.cs 2011-06-30 16:33:47 UTC (rev 5962)
@@ -44,6 +44,7 @@
public WatermarkCollectionEditorCtrl(IResourceService resSvc, IWatermarkCollection watermarks)
{
InitializeComponent();
+ grdWatermarks.AutoGenerateColumns = false;
_watermarks = watermarks;
_resSvc = resSvc;
_list = new BindingList<IWatermark>();
Modified: trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditor.cs 2011-06-30 15:57:53 UTC (rev 5961)
+++ trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditor.cs 2011-06-30 16:33:47 UTC (rev 5962)
@@ -48,11 +48,12 @@
InitializeComponent();
_watermark = watermark;
_resSvc = resSvc;
-
+ cmbUsage.DataSource = Enum.GetValues(typeof(UsageType));
try
{
_init = true;
+ cmbUsage.SelectedItem = _watermark.Usage;
txtResourceId.Text = _watermark.ResourceId;
txtName.Text = _watermark.Name;
Modified: trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkSettingsCtrl.cs 2011-06-30 15:57:53 UTC (rev 5961)
+++ trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkSettingsCtrl.cs 2011-06-30 16:33:47 UTC (rev 5962)
@@ -81,6 +81,11 @@
c.Dock = DockStyle.Fill;
grpPositionSettings.Controls.Add(c);
}
+
+ if (rdTile.Checked)
+ _wm.Position = _tile;
+ else if (rdXY.Checked)
+ _wm.Position = _xy;
}
}
}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/XmlValidator.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/XmlValidator.cs 2011-06-30 15:57:53 UTC (rev 5961)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/XmlValidator.cs 2011-06-30 16:33:47 UTC (rev 5962)
@@ -197,6 +197,10 @@
string version = res.ResourceVersion.ToString();
if (version.StartsWith("2.3.0"))
{
+ var sym = GetXsd(xsdPath, "SymbolDefinition-1.1.0.xsd");
+ if (sym != null)
+ xsds.Add("SymbolDefinition-1.1.0.xsd", sym);
+
var wmd = GetXsd(xsdPath, "WatermarkDefinition-2.3.0.xsd");
if (wmd != null)
xsds.Add("WatermarkDefinition-2.3.0.xsd", wmd);
More information about the mapguide-commits
mailing list