[mapguide-commits] r4471 - in trunk/Tools/Maestro:
Localization/da-DK/Maestro
Localization/da-DK/Maestro/ResourceEditors
Localization/da-DK/Maestro/ResourceEditors/GeometryStyleEditors
Localization/da-DK/Maestro/ResourceEditors/Properties
Localization/da-DK/Maestro/ResourceEditors/Resources
Localization/es-ES/Maestro/ResourceEditors/Properties
Localization/es-ES/Maestro/ResourceEditors/Resources
Localization/fr-FR/Maestro/ResourceEditors/Properties
Localization/fr-FR/Maestro/ResourceEditors/Resources Maestro
Maestro/ResourceEditors Maestro/ResourceEditors/GeometryStyleEditors
Maestro/ResourceEditors/GeometryStyleEditors/Strings
Maestro/ResourceEditors/LayerEditorControls
Maestro/ResourceEditors/LayerEditorControls/ScaleControls
Maestro/ResourceEditors/Properties Maestro/ResourceEditors/Resources
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Dec 24 06:02:35 EST 2009
Author: ksgeograf
Date: 2009-12-24 06:02:34 -0500 (Thu, 24 Dec 2009)
New Revision: 4471
Added:
trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/Strings/FontStyleEditor.Designer.cs
trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/Strings/FontStyleEditor.resx
Removed:
trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml
trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml
trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml
trunk/Tools/Maestro/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml
Modified:
trunk/Tools/Maestro/Localization/da-DK/Maestro/BrowseUnmanagedData.da-DK.resx
trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/GeometryStyleEditors/FontStyleEditor.da-DK.resx
trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleEditor.da-DK.resx
trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/GeometryStyleEditors/PointFeatureStyleEditor.da-DK.resx
trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Properties/Resources.da-DK.resx
trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml
trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/XmlEditorControl.da-DK.resx
trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceEditors/Properties/Resources.es-ES.resx
trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml
trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceEditors/Properties/Resources.fr-FR.resx
trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml
trunk/Tools/Maestro/Maestro/BrowseUnmanagedData.cs
trunk/Tools/Maestro/Maestro/BrowseUnmanagedData.resx
trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/AreaFeatureStyleEditor.cs
trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FontStyleEditor.cs
trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FontStyleEditor.resx
trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineFeatureStyleEditor.cs
trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineFeatureStyleEditor.resx
trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleEditor.cs
trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleEditor.resx
trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/PointFeatureStyleEditor.cs
trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/PointFeatureStyleEditor.resx
trunk/Tools/Maestro/Maestro/ResourceEditors/LayerEditorControls/ScaleControls/ItemStyle.cs
trunk/Tools/Maestro/Maestro/ResourceEditors/LayerEditorControls/VectorLayer.cs
trunk/Tools/Maestro/Maestro/ResourceEditors/Properties/Resources.Designer.cs
trunk/Tools/Maestro/Maestro/ResourceEditors/Properties/Resources.resx
trunk/Tools/Maestro/Maestro/ResourceEditors/ResourceEditors.csproj
trunk/Tools/Maestro/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml
trunk/Tools/Maestro/Maestro/ResourceEditors/ThemeCreator.cs
Log:
Maestro:
Fixed issue #1205.
Modified: trunk/Tools/Maestro/Localization/da-DK/Maestro/BrowseUnmanagedData.da-DK.resx
===================================================================
--- trunk/Tools/Maestro/Localization/da-DK/Maestro/BrowseUnmanagedData.da-DK.resx 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Localization/da-DK/Maestro/BrowseUnmanagedData.da-DK.resx 2009-12-24 11:02:34 UTC (rev 4471)
@@ -133,4 +133,7 @@
<data name="$this.Text" xml:space="preserve">
<value>Udpeg data på serveren</value>
</data>
+ <data name="CancelBtn.Text" xml:space="preserve">
+ <value>Annuller</value>
+ </data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/GeometryStyleEditors/FontStyleEditor.da-DK.resx
===================================================================
--- trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/GeometryStyleEditors/FontStyleEditor.da-DK.resx 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/GeometryStyleEditors/FontStyleEditor.da-DK.resx 2009-12-24 11:02:34 UTC (rev 4471)
@@ -184,4 +184,7 @@
<data name="DisplayLabel.Text" xml:space="preserve">
<value>Vis labels på objekter</value>
</data>
+ <data name="sizeCombo.Items" xml:space="preserve">
+ <value>Udtryk...</value>
+ </data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleEditor.da-DK.resx
===================================================================
--- trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleEditor.da-DK.resx 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleEditor.da-DK.resx 2009-12-24 11:02:34 UTC (rev 4471)
@@ -133,4 +133,7 @@
<data name="label1.Text" xml:space="preserve">
<value>Gennemsigtighed</value>
</data>
+ <data name="thicknessCombo.Items" xml:space="preserve">
+ <value>Udtryk...</value>
+ </data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/GeometryStyleEditors/PointFeatureStyleEditor.da-DK.resx
===================================================================
--- trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/GeometryStyleEditors/PointFeatureStyleEditor.da-DK.resx 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/GeometryStyleEditors/PointFeatureStyleEditor.da-DK.resx 2009-12-24 11:02:34 UTC (rev 4471)
@@ -250,4 +250,10 @@
KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC
</value>
</data>
+ <data name="HeigthText.Items" xml:space="preserve">
+ <value>Udtryk...</value>
+ </data>
+ <data name="WidthText.Items" xml:space="preserve">
+ <value>Udtryk...</value>
+ </data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Properties/Resources.da-DK.resx
===================================================================
--- trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Properties/Resources.da-DK.resx 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Properties/Resources.da-DK.resx 2009-12-24 11:02:34 UTC (rev 4471)
@@ -120,9 +120,6 @@
<data name="GeometryStyleComboDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\GeometryStyleComboDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
- <data name="FontStyleComboDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\FontStyleComboDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
- </data>
<data name="CommandTypesDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\CommandTypesDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
Deleted: trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml 2009-12-24 11:02:34 UTC (rev 4471)
@@ -1,594 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ComboBoxDataSet>
-
- <Font>
- <Display>Arial</Display>
- <Value>Arial</Value>
- </Font>
- <Font>
- <Display>Arial Black</Display>
- <Value>Arial Black</Value>
- </Font>
- <Font>
- <Display>Arial Narrow</Display>
- <Value>Arial Narrow</Value>
- </Font>
- <Font>
- <Display>BankGothic Lt BT</Display>
- <Value>ankGothic Lt BT</Value>
- </Font>
- <Font>
- <Display>BankGothic Md BT</Display>
- <Value>BankGothic Md BT</Value>
- </Font>
- <Font>
- <Display>Book Antiqua</Display>
- <Value>Book Antiqua</Value>
- </Font>
- <Font>
- <Display>Bookman Old Style</Display>
- <Value>Bookman Old Style</Value>
- </Font>
- <Font>
- <Display>Century Gothic</Display>
- <Value>Century Gothic</Value>
- </Font>
- <Font>
- <Display>CityBlueprint</Display>
- <Value>CityBlueprint</Value>
- </Font>
- <Font>
- <Display>Comic Sans MS</Display>
- <Value>Comic Sans MS</Value>
- </Font>
- <Font>
- <Display>CommercialPi BT</Display>
- <Value>CommercialPi BT</Value>
- </Font>
- <Font>
- <Display>CommercialScript BT</Display>
- <Value>CommercialScript BT</Value>
- </Font>
- <Font>
- <Display>Complex</Display>
- <Value>Complex</Value>
- </Font>
- <Font>
- <Display>CountryBlueprint</Display>
- <Value>CountryBlueprint</Value>
- </Font>
- <Font>
- <Display>Courier New</Display>
- <Value>Courier New</Value>
- </Font>
- <Font>
- <Display>Dutch801 Rm BT</Display>
- <Value>Dutch801 Rm BT</Value>
- </Font>
- <Font>
- <Display>Dutch801 XBd BT</Display>
- <Value>Dutch801 XBd BT</Value>
- </Font>
- <Font>
- <Display>Estrangelo Edessa</Display>
- <Value>Estrangelo Edessa</Value>
- </Font>
- <Font>
- <Display>EuroRoman</Display>
- <Value>EuroRoman</Value>
- </Font>
- <Font>
- <Display>Franklin Gothic Medium</Display>
- <Value>Franklin Gothic Medium</Value>
- </Font>
- <Font>
- <Display>Garamond</Display>
- <Value>Garamond</Value>
- </Font>
- <Font>
- <Display>Gautami</Display>
- <Value>Gautami</Value>
- </Font>
- <Font>
- <Display>GDT</Display>
- <Value>GDT</Value>
- </Font>
- <Font>
- <Display>Georgia</Display>
- <Value>Georgia</Value>
- </Font>
- <Font>
- <Display>GothicE</Display>
- <Value>GothicE</Value>
- </Font>
- <Font>
- <Display>GothicG</Display>
- <Value>GothicG</Value>
- </Font>
- <Font>
- <Display>Gothicl</Display>
- <Value>Gothicl</Value>
- </Font>
- <Font>
- <Display>GreekC</Display>
- <Value>GreekC</Value>
- </Font>
- <Font>
- <Display>GreekS</Display>
- <Value>GreekS</Value>
- </Font>
- <Font>
- <Display>Haettenschweiler</Display>
- <Value>Haettenschweiler</Value>
- </Font>
- <Font>
- <Display>Impact</Display>
- <Value>Impact</Value>
- </Font>
- <Font>
- <Display>ISOCP</Display>
- <Value>ISOCP</Value>
- </Font>
- <Font>
- <Display>ISOCP2</Display>
- <Value>ISOCP2</Value>
- </Font>
- <Font>
- <Display>ISOCP3</Display>
- <Value>ISOCP3</Value>
- </Font>
- <Font>
- <Display>ISOCPEUR</Display>
- <Value>Arial</Value>
- </Font>
- <Font>
- <Display>ISOCT</Display>
- <Value>ISOCT</Value>
- </Font>
- <Font>
- <Display>ISOCT2</Display>
- <Value>ISOCT2</Value>
- </Font>
- <Font>
- <Display>ISOCT3</Display>
- <Value>ISOCT3</Value>
- </Font>
- <Font>
- <Display>ISOCTEUR</Display>
- <Value>ISOCTEUR</Value>
- </Font>
- <Font>
- <Display>Italic</Display>
- <Value>Italic</Value>
- </Font>
- <Font>
- <Display>ItalicC</Display>
- <Value>ItalicC</Value>
- </Font>
- <Font>
- <Display>ItalicT</Display>
- <Value>ItalicT</Value>
- </Font>
- <Font>
- <Display>Kartika</Display>
- <Value>Kartika</Value>
- </Font>
- <Font>
- <Display>Latha</Display>
- <Value>Latha</Value>
- </Font>
- <Font>
- <Display>Lucida Console</Display>
- <Value>Lucida Console</Value>
- </Font>
- <Font>
- <Display>Lucida Sans Unicode</Display>
- <Value>Lucida Sans Unicode</Value>
- </Font>
- <Font>
- <Display>Mangal</Display>
- <Value>Mangal</Value>
- </Font>
- <Font>
- <Display>Map Symbols</Display>
- <Value>Map Symbols</Value>
- </Font>
- <Font>
- <Display>MapInfo Arrows</Display>
- <Value>MapInfo Arrows</Value>
- </Font>
- <Font>
- <Display>MapInfo Cartographic</Display>
- <Value>MapInfo Cartographic</Value>
- </Font>
- <Font>
- <Display>MapInfo Dispersed Groups</Display>
- <Value>MapInfo Dispersed Groups</Value>
- </Font>
- <Font>
- <Display>MapInfo Miscellaneous</Display>
- <Value>MapInfo Miscellaneous</Value>
- </Font>
- <Font>
- <Display>MapInfo Oil&Gas</Display>
- <Value>MapInfo Oil&Gas</Value>
- </Font>
- <Font>
- <Display>MapInfo Real Estate</Display>
- <Value>MapInfo Real Estate</Value>
- </Font>
- <Font>
- <Display>MapInfo Shields</Display>
- <Value>MapInfo Shields</Value>
- </Font>
- <Font>
- <Display>MapInfo Symbols</Display>
- <Value>MapInfo Symbols</Value>
- </Font>
- <Font>
- <Display>MapInfo Transportation</Display>
- <Value>MapInfo Transportation</Value>
- </Font>
- <Font>
- <Display>MapInfo Weather</Display>
- <Value>MapInfo Weather</Value>
- </Font>
- <Font>
- <Display>Marlett</Display>
- <Value>Marlett</Value>
- </Font>
- <Font>
- <Display>Microsoft Sans Serif</Display>
- <Value>Microsoft Sans Serif</Value>
- </Font>
- <Font>
- <Display>Monospac821 BT</Display>
- <Value>Monospac821 BT</Value>
- </Font>
- <Font>
- <Display>Monotxt</Display>
- <Value>Monotxt</Value>
- </Font>
- <Font>
- <Display>MV Boli</Display>
- <Value>MV Boli</Value>
- </Font>
- <Font>
- <Display>Nina</Display>
- <Value>Nina</Value>
- </Font>
- <Font>
- <Display>Palatino Linotype</Display>
- <Value>Palatino Linotype</Value>
- </Font>
- <Font>
- <Display>PanRoman</Display>
- <Value>PanRoman</Value>
- </Font>
- <Font>
- <Display>Proxy 1</Display>
- <Value>Proxy 1</Value>
- </Font>
- <Font>
- <Display>Proxy 2</Display>
- <Value>Proxy 2</Value>
- </Font>
- <Font>
- <Display>Proxy 3</Display>
- <Value>Proxy 3</Value>
- </Font>
- <Font>
- <Display>Proxy 4</Display>
- <Value>Proxy 4</Value>
- </Font>
- <Font>
- <Display>Proxy 5</Display>
- <Value>Proxy 5</Value>
- </Font>
- <Font>
- <Display>Proxy 6</Display>
- <Value>Proxy 6</Value>
- </Font>
- <Font>
- <Display>Proxy 7</Display>
- <Value>Proxy 7</Value>
- </Font>
- <Font>
- <Display>Proxy 8</Display>
- <Value>Proxy 8</Value>
- </Font>
- <Font>
- <Display>Proxy 9</Display>
- <Value>Proxy 9</Value>
- </Font>
- <Font>
- <Display>Raavi</Display>
- <Value>Raavi</Value>
- </Font>
- <Font>
- <Display>RomanC</Display>
- <Value>RomanC</Value>
- </Font>
- <Font>
- <Display>RomanD</Display>
- <Value>RomanD</Value>
- </Font>
- <Font>
- <Display>RomanS</Display>
- <Value>RomanS</Value>
- </Font>
- <Font>
- <Display>RomanT</Display>
- <Value>RomanT</Value>
- </Font>
- <Font>
- <Display>Romantic</Display>
- <Value>Romantic</Value>
- </Font>
- <Font>
- <Display>SansSerif</Display>
- <Value>SansSerif</Value>
- </Font>
- <Font>
- <Display>ScriptC</Display>
- <Value>ScriptC</Value>
- </Font>
- <Font>
- <Display>ScriptS</Display>
- <Value>ScriptS</Value>
- </Font>
- <Font>
- <Display>Shruti</Display>
- <Value>Shruti</Value>
- </Font>
- <Font>
- <Display>Simplex</Display>
- <Value>Simplex</Value>
- </Font>
- <Font>
- <Display>Stylus BT</Display>
- <Value>Stylus BT</Value>
- </Font>
- <Font>
- <Display>SuperFrench</Display>
- <Value>SuperFrench</Value>
- </Font>
- <Font>
- <Display>Swis721 BdCnOul BT</Display>
- <Value>Swis721 BdCnOul BT</Value>
- </Font>
- <Font>
- <Display>Swis721 BdOul BT</Display>
- <Value>Swis721 BdOul BT</Value>
- </Font>
- <Font>
- <Display>Swis721 Blk BT</Display>
- <Value>Swis721 Blk BT</Value>
- </Font>
- <Font>
- <Display>Swis721 BlkCn BT</Display>
- <Value>Swis721 BlkCn BT</Value>
- </Font>
- <Font>
- <Display>Swis721 BlkEx BT</Display>
- <Value>Swis721 BlkEx BT</Value>
- </Font>
- <Font>
- <Display>Swis721 BlkOul BT</Display>
- <Value>Swis721 BlkOul BT</Value>
- </Font>
- <Font>
- <Display>Swis721 BT</Display>
- <Value>Swis721 BT</Value>
- </Font>
- <Font>
- <Display>Swis721 Cn BT</Display>
- <Value>Swis721 Cn BT</Value>
- </Font>
- <Font>
- <Display>Swis721 Ex BT</Display>
- <Value>Swis721 Ex BT</Value>
- </Font>
- <Font>
- <Display>Swis721 Lt BT</Display>
- <Value>Swis721 Lt BT</Value>
- </Font>
- <Font>
- <Display>Swis721 LtCn BT</Display>
- <Value>Swis721 LtCn BT</Value>
- </Font>
- <Font>
- <Display>Swis721 LtEx BT</Display>
- <Value>Swis721 LtEx BT</Value>
- </Font>
- <Font>
- <Display>Syastro</Display>
- <Value>Syastro</Value>
- </Font>
- <Font>
- <Display>Sylfaen</Display>
- <Value>Sylfaen</Value>
- </Font>
- <Font>
- <Display>Symap</Display>
- <Value>Symap</Value>
- </Font>
- <Font>
- <Display>Symath</Display>
- <Value>Symath</Value>
- </Font>
- <Font>
- <Display>Symbol</Display>
- <Value>Symbol</Value>
- </Font>
- <Font>
- <Display>Symeteo</Display>
- <Value>Symeteo</Value>
- </Font>
- <Font>
- <Display>Symusic</Display>
- <Value>Symusic</Value>
- </Font>
- <Font>
- <Display>Tahoma</Display>
- <Value>Tahoma</Value>
- </Font>
- <Font>
- <Display>Technic</Display>
- <Value>Technic</Value>
- </Font>
- <Font>
- <Display>TechnicBold</Display>
- <Value>TechnicBold</Value>
- </Font>
- <Font>
- <Display>TechnicLite</Display>
- <Value>TechnicLite</Value>
- </Font>
- <Font>
- <Display>Times New Roman</Display>
- <Value>Times New Roman</Value>
- </Font>
- <Font>
- <Display>Trebuchet MS</Display>
- <Value>Trebuchet MS</Value>
- </Font>
- <Font>
- <Display>Tunga</Display>
- <Value>Tunga</Value>
- </Font>
- <Font>
- <Display>Txt</Display>
- <Value>Txt</Value>
- </Font>
- <Font>
- <Display>UniversalMath1 BT</Display>
- <Value>UniversalMath1 BT</Value>
- </Font>
- <Font>
- <Display>Verdana</Display>
- <Value>Verdana</Value>
- </Font>
- <Font>
- <Display>Vineta BT</Display>
- <Value>Vineta BT</Value>
- </Font>
- <Font>
- <Display>Vrinda</Display>
- <Value>Vrinda</Value>
- </Font>
- <Font>
- <Display>Webdings</Display>
- <Value>Webdings</Value>
- </Font>
- <Font>
- <Display>Windings</Display>
- <Value>Windings</Value>
- </Font>
- <Font>
- <Display>Windings 2</Display>
- <Value>Windings 2</Value>
- </Font>
- <Font>
- <Display>Windings 3</Display>
- <Value>Windings 3</Value>
- </Font>
-
- <BackgroundType>
- <Display>Kantskygge</Display>
- <Value>Ghosted</Value>
- </BackgroundType>
- <BackgroundType>
- <Display>Udfyldt</Display>
- <Value>Opaque</Value>
- </BackgroundType>
- <BackgroundType>
- <Display>Gennemsigtig</Display>
- <Value>Transparent</Value>
- </BackgroundType>
-
- <Vertical>
- <Display>Baseline</Display>
- <Value>'Baseline'</Value>
- </Vertical>
- <Vertical>
- <Display>Bunden</Display>
- <Value>'Bottom'</Value>
- </Vertical>
- <Vertical>
- <Display>Capline</Display>
- <Value>'Capline'</Value>
- </Vertical>
- <Vertical>
- <Display>Midten</Display>
- <Value>'Halfline'</Value>
- </Vertical>
- <Vertical>
- <Display>Toppen</Display>
- <Value>'Top'</Value>
- </Vertical>
-
- <Horizontal>
- <Display>Center</Display>
- <Value>'Center'</Value>
- </Horizontal>
-
- <SizeContext>
- <Display>Skærm enheder</Display>
- <Value>DeviceUnits</Value>
- </SizeContext>
- <SizeContext>
- <Display>Kort enheder</Display>
- <Value>MappingUnits</Value>
- </SizeContext>
-
- <Units>
- <Display>Punkter</Display>
- <Value>Points</Value>
- </Units>
- <Units>
- <Display>Tommer</Display>
- <Value>Inches</Value>
- </Units>
- <Units>
- <Display>Fod</Display>
- <Value>Feet</Value>
- </Units>
- <Units>
- <Display>Yards</Display>
- <Value>Yards</Value>
- </Units>
- <Units>
- <Display>Millimeter</Display>
- <Value>Millimeters</Value>
- </Units>
- <Units>
- <Display>Centimeter</Display>
- <Value>Centimeters</Value>
- </Units>
- <Units>
- <Display>Meter</Display>
- <Value>Meters</Value>
- </Units>
- <Units>
- <Display>Kilometer</Display>
- <Value>Kilometers</Value>
- </Units>
-
- <Rotation>
- <Display>0 grader</Display>
- <Value>0</Value>
- </Rotation>
- <Rotation>
- <Display>30 grader</Display>
- <Value>30</Value>
- </Rotation>
- <Rotation>
- <Display>45 grader</Display>
- <Value>45</Value>
- </Rotation>
- <Rotation>
- <Display>90 grader</Display>
- <Value>90</Value>
- </Rotation>
-</ComboBoxDataSet>
Modified: trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml 2009-12-24 11:02:34 UTC (rev 4471)
@@ -91,4 +91,55 @@
<Display>90 grader</Display>
<Value>90</Value>
</Rotation>
+ <Rotation>
+ <Display>Udtryk...</Display>
+ <Value>Expression...</Value>
+ </Rotation>
+
+ <BackgroundType>
+ <Display>Optrukken kant</Display>
+ <Value>Ghosted</Value>
+ </BackgroundType>
+ <BackgroundType>
+ <Display>Ugennemsigtig</Display>
+ <Value>Opaque</Value>
+ </BackgroundType>
+ <BackgroundType>
+ <Display>Gennemsigtig</Display>
+ <Value>Transparent</Value>
+ </BackgroundType>
+
+ <Vertical>
+ <Display>Baseline</Display>
+ <Value>'Baseline'</Value>
+ </Vertical>
+ <Vertical>
+ <Display>Bund</Display>
+ <Value>'Bottom'</Value>
+ </Vertical>
+ <Vertical>
+ <Display>Capline</Display>
+ <Value>'Capline'</Value>
+ </Vertical>
+ <Vertical>
+ <Display>Halfline</Display>
+ <Value>'Halfline'</Value>
+ </Vertical>
+ <Vertical>
+ <Display>Top</Display>
+ <Value>'Top'</Value>
+ </Vertical>
+ <Vertical>
+ <Display>Expression...</Display>
+ <Value>Expression...</Value>
+ </Vertical>
+
+ <Horizontal>
+ <Display>Center</Display>
+ <Value>'Center'</Value>
+ </Horizontal>
+ <Horizontal>
+ <Display>Expression...</Display>
+ <Value>Expression...</Value>
+ </Horizontal>
</ComboBoxDataSet>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/XmlEditorControl.da-DK.resx
===================================================================
--- trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/XmlEditorControl.da-DK.resx 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Localization/da-DK/Maestro/ResourceEditors/XmlEditorControl.da-DK.resx 2009-12-24 11:02:34 UTC (rev 4471)
@@ -151,4 +151,7 @@
<data name="ResourceDataGroup.Text" xml:space="preserve">
<value>Elementets datafiler</value>
</data>
+ <data name="toolStripLabel1.Text" xml:space="preserve">
+ <value>Linie {0}, kolonne {1}</value>
+ </data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceEditors/Properties/Resources.es-ES.resx
===================================================================
--- trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceEditors/Properties/Resources.es-ES.resx 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceEditors/Properties/Resources.es-ES.resx 2009-12-24 11:02:34 UTC (rev 4471)
@@ -120,9 +120,6 @@
<data name="GeometryStyleComboDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\GeometryStyleComboDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
- <data name="FontStyleComboDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\FontStyleComboDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
- </data>
<data name="CommandTypesDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\CommandTypesDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
Deleted: trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml 2009-12-24 11:02:34 UTC (rev 4471)
@@ -1,594 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ComboBoxDataSet>
-
- <Font>
- <Display>Arial</Display>
- <Value>Arial</Value>
- </Font>
- <Font>
- <Display>Arial Black</Display>
- <Value>Arial Black</Value>
- </Font>
- <Font>
- <Display>Arial Narrow</Display>
- <Value>Arial Narrow</Value>
- </Font>
- <Font>
- <Display>BankGothic Lt BT</Display>
- <Value>ankGothic Lt BT</Value>
- </Font>
- <Font>
- <Display>BankGothic Md BT</Display>
- <Value>BankGothic Md BT</Value>
- </Font>
- <Font>
- <Display>Book Antiqua</Display>
- <Value>Book Antiqua</Value>
- </Font>
- <Font>
- <Display>Bookman Old Style</Display>
- <Value>Bookman Old Style</Value>
- </Font>
- <Font>
- <Display>Century Gothic</Display>
- <Value>Century Gothic</Value>
- </Font>
- <Font>
- <Display>CityBlueprint</Display>
- <Value>CityBlueprint</Value>
- </Font>
- <Font>
- <Display>Comic Sans MS</Display>
- <Value>Comic Sans MS</Value>
- </Font>
- <Font>
- <Display>CommercialPi BT</Display>
- <Value>CommercialPi BT</Value>
- </Font>
- <Font>
- <Display>CommercialScript BT</Display>
- <Value>CommercialScript BT</Value>
- </Font>
- <Font>
- <Display>Complex</Display>
- <Value>Complex</Value>
- </Font>
- <Font>
- <Display>CountryBlueprint</Display>
- <Value>CountryBlueprint</Value>
- </Font>
- <Font>
- <Display>Courier New</Display>
- <Value>Courier New</Value>
- </Font>
- <Font>
- <Display>Dutch801 Rm BT</Display>
- <Value>Dutch801 Rm BT</Value>
- </Font>
- <Font>
- <Display>Dutch801 XBd BT</Display>
- <Value>Dutch801 XBd BT</Value>
- </Font>
- <Font>
- <Display>Estrangelo Edessa</Display>
- <Value>Estrangelo Edessa</Value>
- </Font>
- <Font>
- <Display>EuroRoman</Display>
- <Value>EuroRoman</Value>
- </Font>
- <Font>
- <Display>Franklin Gothic Medium</Display>
- <Value>Franklin Gothic Medium</Value>
- </Font>
- <Font>
- <Display>Garamond</Display>
- <Value>Garamond</Value>
- </Font>
- <Font>
- <Display>Gautami</Display>
- <Value>Gautami</Value>
- </Font>
- <Font>
- <Display>GDT</Display>
- <Value>GDT</Value>
- </Font>
- <Font>
- <Display>Georgia</Display>
- <Value>Georgia</Value>
- </Font>
- <Font>
- <Display>GothicE</Display>
- <Value>GothicE</Value>
- </Font>
- <Font>
- <Display>GothicG</Display>
- <Value>GothicG</Value>
- </Font>
- <Font>
- <Display>Gothicl</Display>
- <Value>Gothicl</Value>
- </Font>
- <Font>
- <Display>GreekC</Display>
- <Value>GreekC</Value>
- </Font>
- <Font>
- <Display>GreekS</Display>
- <Value>GreekS</Value>
- </Font>
- <Font>
- <Display>Haettenschweiler</Display>
- <Value>Haettenschweiler</Value>
- </Font>
- <Font>
- <Display>Impact</Display>
- <Value>Impact</Value>
- </Font>
- <Font>
- <Display>ISOCP</Display>
- <Value>ISOCP</Value>
- </Font>
- <Font>
- <Display>ISOCP2</Display>
- <Value>ISOCP2</Value>
- </Font>
- <Font>
- <Display>ISOCP3</Display>
- <Value>ISOCP3</Value>
- </Font>
- <Font>
- <Display>ISOCPEUR</Display>
- <Value>Arial</Value>
- </Font>
- <Font>
- <Display>ISOCT</Display>
- <Value>ISOCT</Value>
- </Font>
- <Font>
- <Display>ISOCT2</Display>
- <Value>ISOCT2</Value>
- </Font>
- <Font>
- <Display>ISOCT3</Display>
- <Value>ISOCT3</Value>
- </Font>
- <Font>
- <Display>ISOCTEUR</Display>
- <Value>ISOCTEUR</Value>
- </Font>
- <Font>
- <Display>Italic</Display>
- <Value>Italic</Value>
- </Font>
- <Font>
- <Display>ItalicC</Display>
- <Value>ItalicC</Value>
- </Font>
- <Font>
- <Display>ItalicT</Display>
- <Value>ItalicT</Value>
- </Font>
- <Font>
- <Display>Kartika</Display>
- <Value>Kartika</Value>
- </Font>
- <Font>
- <Display>Latha</Display>
- <Value>Latha</Value>
- </Font>
- <Font>
- <Display>Lucida Console</Display>
- <Value>Lucida Console</Value>
- </Font>
- <Font>
- <Display>Lucida Sans Unicode</Display>
- <Value>Lucida Sans Unicode</Value>
- </Font>
- <Font>
- <Display>Mangal</Display>
- <Value>Mangal</Value>
- </Font>
- <Font>
- <Display>Map Symbols</Display>
- <Value>Map Symbols</Value>
- </Font>
- <Font>
- <Display>MapInfo Arrows</Display>
- <Value>MapInfo Arrows</Value>
- </Font>
- <Font>
- <Display>MapInfo Cartographic</Display>
- <Value>MapInfo Cartographic</Value>
- </Font>
- <Font>
- <Display>MapInfo Dispersed Groups</Display>
- <Value>MapInfo Dispersed Groups</Value>
- </Font>
- <Font>
- <Display>MapInfo Miscellaneous</Display>
- <Value>MapInfo Miscellaneous</Value>
- </Font>
- <Font>
- <Display>MapInfo Oil&Gas</Display>
- <Value>MapInfo Oil&Gas</Value>
- </Font>
- <Font>
- <Display>MapInfo Real Estate</Display>
- <Value>MapInfo Real Estate</Value>
- </Font>
- <Font>
- <Display>MapInfo Shields</Display>
- <Value>MapInfo Shields</Value>
- </Font>
- <Font>
- <Display>MapInfo Symbols</Display>
- <Value>MapInfo Symbols</Value>
- </Font>
- <Font>
- <Display>MapInfo Transportation</Display>
- <Value>MapInfo Transportation</Value>
- </Font>
- <Font>
- <Display>MapInfo Weather</Display>
- <Value>MapInfo Weather</Value>
- </Font>
- <Font>
- <Display>Marlett</Display>
- <Value>Marlett</Value>
- </Font>
- <Font>
- <Display>Microsoft Sans Serif</Display>
- <Value>Microsoft Sans Serif</Value>
- </Font>
- <Font>
- <Display>Monospac821 BT</Display>
- <Value>Monospac821 BT</Value>
- </Font>
- <Font>
- <Display>Monotxt</Display>
- <Value>Monotxt</Value>
- </Font>
- <Font>
- <Display>MV Boli</Display>
- <Value>MV Boli</Value>
- </Font>
- <Font>
- <Display>Nina</Display>
- <Value>Nina</Value>
- </Font>
- <Font>
- <Display>Palatino Linotype</Display>
- <Value>Palatino Linotype</Value>
- </Font>
- <Font>
- <Display>PanRoman</Display>
- <Value>PanRoman</Value>
- </Font>
- <Font>
- <Display>Proxy 1</Display>
- <Value>Proxy 1</Value>
- </Font>
- <Font>
- <Display>Proxy 2</Display>
- <Value>Proxy 2</Value>
- </Font>
- <Font>
- <Display>Proxy 3</Display>
- <Value>Proxy 3</Value>
- </Font>
- <Font>
- <Display>Proxy 4</Display>
- <Value>Proxy 4</Value>
- </Font>
- <Font>
- <Display>Proxy 5</Display>
- <Value>Proxy 5</Value>
- </Font>
- <Font>
- <Display>Proxy 6</Display>
- <Value>Proxy 6</Value>
- </Font>
- <Font>
- <Display>Proxy 7</Display>
- <Value>Proxy 7</Value>
- </Font>
- <Font>
- <Display>Proxy 8</Display>
- <Value>Proxy 8</Value>
- </Font>
- <Font>
- <Display>Proxy 9</Display>
- <Value>Proxy 9</Value>
- </Font>
- <Font>
- <Display>Raavi</Display>
- <Value>Raavi</Value>
- </Font>
- <Font>
- <Display>RomanC</Display>
- <Value>RomanC</Value>
- </Font>
- <Font>
- <Display>RomanD</Display>
- <Value>RomanD</Value>
- </Font>
- <Font>
- <Display>RomanS</Display>
- <Value>RomanS</Value>
- </Font>
- <Font>
- <Display>RomanT</Display>
- <Value>RomanT</Value>
- </Font>
- <Font>
- <Display>Romantic</Display>
- <Value>Romantic</Value>
- </Font>
- <Font>
- <Display>SansSerif</Display>
- <Value>SansSerif</Value>
- </Font>
- <Font>
- <Display>ScriptC</Display>
- <Value>ScriptC</Value>
- </Font>
- <Font>
- <Display>ScriptS</Display>
- <Value>ScriptS</Value>
- </Font>
- <Font>
- <Display>Shruti</Display>
- <Value>Shruti</Value>
- </Font>
- <Font>
- <Display>Simplex</Display>
- <Value>Simplex</Value>
- </Font>
- <Font>
- <Display>Stylus BT</Display>
- <Value>Stylus BT</Value>
- </Font>
- <Font>
- <Display>SuperFrench</Display>
- <Value>SuperFrench</Value>
- </Font>
- <Font>
- <Display>Swis721 BdCnOul BT</Display>
- <Value>Swis721 BdCnOul BT</Value>
- </Font>
- <Font>
- <Display>Swis721 BdOul BT</Display>
- <Value>Swis721 BdOul BT</Value>
- </Font>
- <Font>
- <Display>Swis721 Blk BT</Display>
- <Value>Swis721 Blk BT</Value>
- </Font>
- <Font>
- <Display>Swis721 BlkCn BT</Display>
- <Value>Swis721 BlkCn BT</Value>
- </Font>
- <Font>
- <Display>Swis721 BlkEx BT</Display>
- <Value>Swis721 BlkEx BT</Value>
- </Font>
- <Font>
- <Display>Swis721 BlkOul BT</Display>
- <Value>Swis721 BlkOul BT</Value>
- </Font>
- <Font>
- <Display>Swis721 BT</Display>
- <Value>Swis721 BT</Value>
- </Font>
- <Font>
- <Display>Swis721 Cn BT</Display>
- <Value>Swis721 Cn BT</Value>
- </Font>
- <Font>
- <Display>Swis721 Ex BT</Display>
- <Value>Swis721 Ex BT</Value>
- </Font>
- <Font>
- <Display>Swis721 Lt BT</Display>
- <Value>Swis721 Lt BT</Value>
- </Font>
- <Font>
- <Display>Swis721 LtCn BT</Display>
- <Value>Swis721 LtCn BT</Value>
- </Font>
- <Font>
- <Display>Swis721 LtEx BT</Display>
- <Value>Swis721 LtEx BT</Value>
- </Font>
- <Font>
- <Display>Syastro</Display>
- <Value>Syastro</Value>
- </Font>
- <Font>
- <Display>Sylfaen</Display>
- <Value>Sylfaen</Value>
- </Font>
- <Font>
- <Display>Symap</Display>
- <Value>Symap</Value>
- </Font>
- <Font>
- <Display>Symath</Display>
- <Value>Symath</Value>
- </Font>
- <Font>
- <Display>Symbol</Display>
- <Value>Symbol</Value>
- </Font>
- <Font>
- <Display>Symeteo</Display>
- <Value>Symeteo</Value>
- </Font>
- <Font>
- <Display>Symusic</Display>
- <Value>Symusic</Value>
- </Font>
- <Font>
- <Display>Tahoma</Display>
- <Value>Tahoma</Value>
- </Font>
- <Font>
- <Display>Technic</Display>
- <Value>Technic</Value>
- </Font>
- <Font>
- <Display>TechnicBold</Display>
- <Value>TechnicBold</Value>
- </Font>
- <Font>
- <Display>TechnicLite</Display>
- <Value>TechnicLite</Value>
- </Font>
- <Font>
- <Display>Times New Roman</Display>
- <Value>Times New Roman</Value>
- </Font>
- <Font>
- <Display>Trebuchet MS</Display>
- <Value>Trebuchet MS</Value>
- </Font>
- <Font>
- <Display>Tunga</Display>
- <Value>Tunga</Value>
- </Font>
- <Font>
- <Display>Txt</Display>
- <Value>Txt</Value>
- </Font>
- <Font>
- <Display>UniversalMath1 BT</Display>
- <Value>UniversalMath1 BT</Value>
- </Font>
- <Font>
- <Display>Verdana</Display>
- <Value>Verdana</Value>
- </Font>
- <Font>
- <Display>Vineta BT</Display>
- <Value>Vineta BT</Value>
- </Font>
- <Font>
- <Display>Vrinda</Display>
- <Value>Vrinda</Value>
- </Font>
- <Font>
- <Display>Webdings</Display>
- <Value>Webdings</Value>
- </Font>
- <Font>
- <Display>Windings</Display>
- <Value>Windings</Value>
- </Font>
- <Font>
- <Display>Windings 2</Display>
- <Value>Windings 2</Value>
- </Font>
- <Font>
- <Display>Windings 3</Display>
- <Value>Windings 3</Value>
- </Font>
-
- <BackgroundType>
- <Display>Ghosted</Display>
- <Value>Ghosted</Value>
- </BackgroundType>
- <BackgroundType>
- <Display>Opaque</Display>
- <Value>Opaque</Value>
- </BackgroundType>
- <BackgroundType>
- <Display>Transparent</Display>
- <Value>Transparent</Value>
- </BackgroundType>
-
- <Vertical>
- <Display>Baseline</Display>
- <Value>'Baseline'</Value>
- </Vertical>
- <Vertical>
- <Display>Bottom</Display>
- <Value>'Bottom'</Value>
- </Vertical>
- <Vertical>
- <Display>Capline</Display>
- <Value>'Capline'</Value>
- </Vertical>
- <Vertical>
- <Display>Halfline</Display>
- <Value>'Halfline'</Value>
- </Vertical>
- <Vertical>
- <Display>Top</Display>
- <Value>'Top'</Value>
- </Vertical>
-
- <Horizontal>
- <Display>Center</Display>
- <Value>'Center'</Value>
- </Horizontal>
-
- <SizeContext>
- <Display>Device space</Display>
- <Value>DeviceUnits</Value>
- </SizeContext>
- <SizeContext>
- <Display>Map space</Display>
- <Value>MappingUnits</Value>
- </SizeContext>
-
- <Units>
- <Display>Points</Display>
- <Value>Points</Value>
- </Units>
- <Units>
- <Display>Inches</Display>
- <Value>Inches</Value>
- </Units>
- <Units>
- <Display>Feet</Display>
- <Value>Feet</Value>
- </Units>
- <Units>
- <Display>Yards</Display>
- <Value>Yards</Value>
- </Units>
- <Units>
- <Display>Millimeters</Display>
- <Value>Millimeters</Value>
- </Units>
- <Units>
- <Display>Centimeters</Display>
- <Value>Centimeters</Value>
- </Units>
- <Units>
- <Display>Meters</Display>
- <Value>Meters</Value>
- </Units>
- <Units>
- <Display>Kilometers</Display>
- <Value>Kilometers</Value>
- </Units>
-
- <Rotation>
- <Display>0 degrees</Display>
- <Value>0</Value>
- </Rotation>
- <Rotation>
- <Display>30 degrees</Display>
- <Value>30</Value>
- </Rotation>
- <Rotation>
- <Display>45 degrees</Display>
- <Value>45</Value>
- </Rotation>
- <Rotation>
- <Display>90 degrees</Display>
- <Value>90</Value>
- </Rotation>
-</ComboBoxDataSet>
Modified: trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Localization/es-ES/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml 2009-12-24 11:02:34 UTC (rev 4471)
@@ -91,4 +91,56 @@
<Display>90 degrees</Display>
<Value>90</Value>
</Rotation>
+ <Rotation>
+ <Display>Expression...</Display>
+ <Value>Expression...</Value>
+ </Rotation>
+
+ <BackgroundType>
+ <Display>Ghosted</Display>
+ <Value>Ghosted</Value>
+ </BackgroundType>
+ <BackgroundType>
+ <Display>Opaque</Display>
+ <Value>Opaque</Value>
+ </BackgroundType>
+ <BackgroundType>
+ <Display>Transparent</Display>
+ <Value>Transparent</Value>
+ </BackgroundType>
+
+ <Vertical>
+ <Display>Baseline</Display>
+ <Value>'Baseline'</Value>
+ </Vertical>
+ <Vertical>
+ <Display>Bottom</Display>
+ <Value>'Bottom'</Value>
+ </Vertical>
+ <Vertical>
+ <Display>Capline</Display>
+ <Value>'Capline'</Value>
+ </Vertical>
+ <Vertical>
+ <Display>Halfline</Display>
+ <Value>'Halfline'</Value>
+ </Vertical>
+ <Vertical>
+ <Display>Top</Display>
+ <Value>'Top'</Value>
+ </Vertical>
+ <Vertical>
+ <Display>Expression...</Display>
+ <Value>Expression...</Value>
+ </Vertical>
+
+ <Horizontal>
+ <Display>Center</Display>
+ <Value>'Center'</Value>
+ </Horizontal>
+ <Horizontal>
+ <Display>Expression...</Display>
+ <Value>Expression...</Value>
+ </Horizontal>
+
</ComboBoxDataSet>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceEditors/Properties/Resources.fr-FR.resx
===================================================================
--- trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceEditors/Properties/Resources.fr-FR.resx 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceEditors/Properties/Resources.fr-FR.resx 2009-12-24 11:02:34 UTC (rev 4471)
@@ -120,9 +120,6 @@
<data name="GeometryStyleComboDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\GeometryStyleComboDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
- <data name="FontStyleComboDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\FontStyleComboDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
- </data>
<data name="CommandTypesDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\CommandTypesDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
Deleted: trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml 2009-12-24 11:02:34 UTC (rev 4471)
@@ -1,594 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ComboBoxDataSet>
-
- <Font>
- <Display>Arial</Display>
- <Value>Arial</Value>
- </Font>
- <Font>
- <Display>Arial Black</Display>
- <Value>Arial Black</Value>
- </Font>
- <Font>
- <Display>Arial Narrow</Display>
- <Value>Arial Narrow</Value>
- </Font>
- <Font>
- <Display>BankGothic Lt BT</Display>
- <Value>ankGothic Lt BT</Value>
- </Font>
- <Font>
- <Display>BankGothic Md BT</Display>
- <Value>BankGothic Md BT</Value>
- </Font>
- <Font>
- <Display>Book Antiqua</Display>
- <Value>Book Antiqua</Value>
- </Font>
- <Font>
- <Display>Bookman Old Style</Display>
- <Value>Bookman Old Style</Value>
- </Font>
- <Font>
- <Display>Century Gothic</Display>
- <Value>Century Gothic</Value>
- </Font>
- <Font>
- <Display>CityBlueprint</Display>
- <Value>CityBlueprint</Value>
- </Font>
- <Font>
- <Display>Comic Sans MS</Display>
- <Value>Comic Sans MS</Value>
- </Font>
- <Font>
- <Display>CommercialPi BT</Display>
- <Value>CommercialPi BT</Value>
- </Font>
- <Font>
- <Display>CommercialScript BT</Display>
- <Value>CommercialScript BT</Value>
- </Font>
- <Font>
- <Display>Complex</Display>
- <Value>Complex</Value>
- </Font>
- <Font>
- <Display>CountryBlueprint</Display>
- <Value>CountryBlueprint</Value>
- </Font>
- <Font>
- <Display>Courier New</Display>
- <Value>Courier New</Value>
- </Font>
- <Font>
- <Display>Dutch801 Rm BT</Display>
- <Value>Dutch801 Rm BT</Value>
- </Font>
- <Font>
- <Display>Dutch801 XBd BT</Display>
- <Value>Dutch801 XBd BT</Value>
- </Font>
- <Font>
- <Display>Estrangelo Edessa</Display>
- <Value>Estrangelo Edessa</Value>
- </Font>
- <Font>
- <Display>EuroRoman</Display>
- <Value>EuroRoman</Value>
- </Font>
- <Font>
- <Display>Franklin Gothic Medium</Display>
- <Value>Franklin Gothic Medium</Value>
- </Font>
- <Font>
- <Display>Garamond</Display>
- <Value>Garamond</Value>
- </Font>
- <Font>
- <Display>Gautami</Display>
- <Value>Gautami</Value>
- </Font>
- <Font>
- <Display>GDT</Display>
- <Value>GDT</Value>
- </Font>
- <Font>
- <Display>Georgia</Display>
- <Value>Georgia</Value>
- </Font>
- <Font>
- <Display>GothicE</Display>
- <Value>GothicE</Value>
- </Font>
- <Font>
- <Display>GothicG</Display>
- <Value>GothicG</Value>
- </Font>
- <Font>
- <Display>Gothicl</Display>
- <Value>Gothicl</Value>
- </Font>
- <Font>
- <Display>GreekC</Display>
- <Value>GreekC</Value>
- </Font>
- <Font>
- <Display>GreekS</Display>
- <Value>GreekS</Value>
- </Font>
- <Font>
- <Display>Haettenschweiler</Display>
- <Value>Haettenschweiler</Value>
- </Font>
- <Font>
- <Display>Impact</Display>
- <Value>Impact</Value>
- </Font>
- <Font>
- <Display>ISOCP</Display>
- <Value>ISOCP</Value>
- </Font>
- <Font>
- <Display>ISOCP2</Display>
- <Value>ISOCP2</Value>
- </Font>
- <Font>
- <Display>ISOCP3</Display>
- <Value>ISOCP3</Value>
- </Font>
- <Font>
- <Display>ISOCPEUR</Display>
- <Value>Arial</Value>
- </Font>
- <Font>
- <Display>ISOCT</Display>
- <Value>ISOCT</Value>
- </Font>
- <Font>
- <Display>ISOCT2</Display>
- <Value>ISOCT2</Value>
- </Font>
- <Font>
- <Display>ISOCT3</Display>
- <Value>ISOCT3</Value>
- </Font>
- <Font>
- <Display>ISOCTEUR</Display>
- <Value>ISOCTEUR</Value>
- </Font>
- <Font>
- <Display>Italic</Display>
- <Value>Italic</Value>
- </Font>
- <Font>
- <Display>ItalicC</Display>
- <Value>ItalicC</Value>
- </Font>
- <Font>
- <Display>ItalicT</Display>
- <Value>ItalicT</Value>
- </Font>
- <Font>
- <Display>Kartika</Display>
- <Value>Kartika</Value>
- </Font>
- <Font>
- <Display>Latha</Display>
- <Value>Latha</Value>
- </Font>
- <Font>
- <Display>Lucida Console</Display>
- <Value>Lucida Console</Value>
- </Font>
- <Font>
- <Display>Lucida Sans Unicode</Display>
- <Value>Lucida Sans Unicode</Value>
- </Font>
- <Font>
- <Display>Mangal</Display>
- <Value>Mangal</Value>
- </Font>
- <Font>
- <Display>Map Symbols</Display>
- <Value>Map Symbols</Value>
- </Font>
- <Font>
- <Display>MapInfo Arrows</Display>
- <Value>MapInfo Arrows</Value>
- </Font>
- <Font>
- <Display>MapInfo Cartographic</Display>
- <Value>MapInfo Cartographic</Value>
- </Font>
- <Font>
- <Display>MapInfo Dispersed Groups</Display>
- <Value>MapInfo Dispersed Groups</Value>
- </Font>
- <Font>
- <Display>MapInfo Miscellaneous</Display>
- <Value>MapInfo Miscellaneous</Value>
- </Font>
- <Font>
- <Display>MapInfo Oil&Gas</Display>
- <Value>MapInfo Oil&Gas</Value>
- </Font>
- <Font>
- <Display>MapInfo Real Estate</Display>
- <Value>MapInfo Real Estate</Value>
- </Font>
- <Font>
- <Display>MapInfo Shields</Display>
- <Value>MapInfo Shields</Value>
- </Font>
- <Font>
- <Display>MapInfo Symbols</Display>
- <Value>MapInfo Symbols</Value>
- </Font>
- <Font>
- <Display>MapInfo Transportation</Display>
- <Value>MapInfo Transportation</Value>
- </Font>
- <Font>
- <Display>MapInfo Weather</Display>
- <Value>MapInfo Weather</Value>
- </Font>
- <Font>
- <Display>Marlett</Display>
- <Value>Marlett</Value>
- </Font>
- <Font>
- <Display>Microsoft Sans Serif</Display>
- <Value>Microsoft Sans Serif</Value>
- </Font>
- <Font>
- <Display>Monospac821 BT</Display>
- <Value>Monospac821 BT</Value>
- </Font>
- <Font>
- <Display>Monotxt</Display>
- <Value>Monotxt</Value>
- </Font>
- <Font>
- <Display>MV Boli</Display>
- <Value>MV Boli</Value>
- </Font>
- <Font>
- <Display>Nina</Display>
- <Value>Nina</Value>
- </Font>
- <Font>
- <Display>Palatino Linotype</Display>
- <Value>Palatino Linotype</Value>
- </Font>
- <Font>
- <Display>PanRoman</Display>
- <Value>PanRoman</Value>
- </Font>
- <Font>
- <Display>Proxy 1</Display>
- <Value>Proxy 1</Value>
- </Font>
- <Font>
- <Display>Proxy 2</Display>
- <Value>Proxy 2</Value>
- </Font>
- <Font>
- <Display>Proxy 3</Display>
- <Value>Proxy 3</Value>
- </Font>
- <Font>
- <Display>Proxy 4</Display>
- <Value>Proxy 4</Value>
- </Font>
- <Font>
- <Display>Proxy 5</Display>
- <Value>Proxy 5</Value>
- </Font>
- <Font>
- <Display>Proxy 6</Display>
- <Value>Proxy 6</Value>
- </Font>
- <Font>
- <Display>Proxy 7</Display>
- <Value>Proxy 7</Value>
- </Font>
- <Font>
- <Display>Proxy 8</Display>
- <Value>Proxy 8</Value>
- </Font>
- <Font>
- <Display>Proxy 9</Display>
- <Value>Proxy 9</Value>
- </Font>
- <Font>
- <Display>Raavi</Display>
- <Value>Raavi</Value>
- </Font>
- <Font>
- <Display>RomanC</Display>
- <Value>RomanC</Value>
- </Font>
- <Font>
- <Display>RomanD</Display>
- <Value>RomanD</Value>
- </Font>
- <Font>
- <Display>RomanS</Display>
- <Value>RomanS</Value>
- </Font>
- <Font>
- <Display>RomanT</Display>
- <Value>RomanT</Value>
- </Font>
- <Font>
- <Display>Romantic</Display>
- <Value>Romantic</Value>
- </Font>
- <Font>
- <Display>SansSerif</Display>
- <Value>SansSerif</Value>
- </Font>
- <Font>
- <Display>ScriptC</Display>
- <Value>ScriptC</Value>
- </Font>
- <Font>
- <Display>ScriptS</Display>
- <Value>ScriptS</Value>
- </Font>
- <Font>
- <Display>Shruti</Display>
- <Value>Shruti</Value>
- </Font>
- <Font>
- <Display>Simplex</Display>
- <Value>Simplex</Value>
- </Font>
- <Font>
- <Display>Stylus BT</Display>
- <Value>Stylus BT</Value>
- </Font>
- <Font>
- <Display>SuperFrench</Display>
- <Value>SuperFrench</Value>
- </Font>
- <Font>
- <Display>Swis721 BdCnOul BT</Display>
- <Value>Swis721 BdCnOul BT</Value>
- </Font>
- <Font>
- <Display>Swis721 BdOul BT</Display>
- <Value>Swis721 BdOul BT</Value>
- </Font>
- <Font>
- <Display>Swis721 Blk BT</Display>
- <Value>Swis721 Blk BT</Value>
- </Font>
- <Font>
- <Display>Swis721 BlkCn BT</Display>
- <Value>Swis721 BlkCn BT</Value>
- </Font>
- <Font>
- <Display>Swis721 BlkEx BT</Display>
- <Value>Swis721 BlkEx BT</Value>
- </Font>
- <Font>
- <Display>Swis721 BlkOul BT</Display>
- <Value>Swis721 BlkOul BT</Value>
- </Font>
- <Font>
- <Display>Swis721 BT</Display>
- <Value>Swis721 BT</Value>
- </Font>
- <Font>
- <Display>Swis721 Cn BT</Display>
- <Value>Swis721 Cn BT</Value>
- </Font>
- <Font>
- <Display>Swis721 Ex BT</Display>
- <Value>Swis721 Ex BT</Value>
- </Font>
- <Font>
- <Display>Swis721 Lt BT</Display>
- <Value>Swis721 Lt BT</Value>
- </Font>
- <Font>
- <Display>Swis721 LtCn BT</Display>
- <Value>Swis721 LtCn BT</Value>
- </Font>
- <Font>
- <Display>Swis721 LtEx BT</Display>
- <Value>Swis721 LtEx BT</Value>
- </Font>
- <Font>
- <Display>Syastro</Display>
- <Value>Syastro</Value>
- </Font>
- <Font>
- <Display>Sylfaen</Display>
- <Value>Sylfaen</Value>
- </Font>
- <Font>
- <Display>Symap</Display>
- <Value>Symap</Value>
- </Font>
- <Font>
- <Display>Symath</Display>
- <Value>Symath</Value>
- </Font>
- <Font>
- <Display>Symbol</Display>
- <Value>Symbol</Value>
- </Font>
- <Font>
- <Display>Symeteo</Display>
- <Value>Symeteo</Value>
- </Font>
- <Font>
- <Display>Symusic</Display>
- <Value>Symusic</Value>
- </Font>
- <Font>
- <Display>Tahoma</Display>
- <Value>Tahoma</Value>
- </Font>
- <Font>
- <Display>Technic</Display>
- <Value>Technic</Value>
- </Font>
- <Font>
- <Display>TechnicBold</Display>
- <Value>TechnicBold</Value>
- </Font>
- <Font>
- <Display>TechnicLite</Display>
- <Value>TechnicLite</Value>
- </Font>
- <Font>
- <Display>Times New Roman</Display>
- <Value>Times New Roman</Value>
- </Font>
- <Font>
- <Display>Trebuchet MS</Display>
- <Value>Trebuchet MS</Value>
- </Font>
- <Font>
- <Display>Tunga</Display>
- <Value>Tunga</Value>
- </Font>
- <Font>
- <Display>Txt</Display>
- <Value>Txt</Value>
- </Font>
- <Font>
- <Display>UniversalMath1 BT</Display>
- <Value>UniversalMath1 BT</Value>
- </Font>
- <Font>
- <Display>Verdana</Display>
- <Value>Verdana</Value>
- </Font>
- <Font>
- <Display>Vineta BT</Display>
- <Value>Vineta BT</Value>
- </Font>
- <Font>
- <Display>Vrinda</Display>
- <Value>Vrinda</Value>
- </Font>
- <Font>
- <Display>Webdings</Display>
- <Value>Webdings</Value>
- </Font>
- <Font>
- <Display>Windings</Display>
- <Value>Windings</Value>
- </Font>
- <Font>
- <Display>Windings 2</Display>
- <Value>Windings 2</Value>
- </Font>
- <Font>
- <Display>Windings 3</Display>
- <Value>Windings 3</Value>
- </Font>
-
- <BackgroundType>
- <Display>Ghosted</Display>
- <Value>Ghosted</Value>
- </BackgroundType>
- <BackgroundType>
- <Display>Opaque</Display>
- <Value>Opaque</Value>
- </BackgroundType>
- <BackgroundType>
- <Display>Transparent</Display>
- <Value>Transparent</Value>
- </BackgroundType>
-
- <Vertical>
- <Display>Baseline</Display>
- <Value>'Baseline'</Value>
- </Vertical>
- <Vertical>
- <Display>Bottom</Display>
- <Value>'Bottom'</Value>
- </Vertical>
- <Vertical>
- <Display>Capline</Display>
- <Value>'Capline'</Value>
- </Vertical>
- <Vertical>
- <Display>Halfline</Display>
- <Value>'Halfline'</Value>
- </Vertical>
- <Vertical>
- <Display>Top</Display>
- <Value>'Top'</Value>
- </Vertical>
-
- <Horizontal>
- <Display>Center</Display>
- <Value>'Center'</Value>
- </Horizontal>
-
- <SizeContext>
- <Display>Device space</Display>
- <Value>DeviceUnits</Value>
- </SizeContext>
- <SizeContext>
- <Display>Map space</Display>
- <Value>MappingUnits</Value>
- </SizeContext>
-
- <Units>
- <Display>Points</Display>
- <Value>Points</Value>
- </Units>
- <Units>
- <Display>Inches</Display>
- <Value>Inches</Value>
- </Units>
- <Units>
- <Display>Feet</Display>
- <Value>Feet</Value>
- </Units>
- <Units>
- <Display>Yards</Display>
- <Value>Yards</Value>
- </Units>
- <Units>
- <Display>Millimeters</Display>
- <Value>Millimeters</Value>
- </Units>
- <Units>
- <Display>Centimeters</Display>
- <Value>Centimeters</Value>
- </Units>
- <Units>
- <Display>Meters</Display>
- <Value>Meters</Value>
- </Units>
- <Units>
- <Display>Kilometers</Display>
- <Value>Kilometers</Value>
- </Units>
-
- <Rotation>
- <Display>0 degrees</Display>
- <Value>0</Value>
- </Rotation>
- <Rotation>
- <Display>30 degrees</Display>
- <Value>30</Value>
- </Rotation>
- <Rotation>
- <Display>45 degrees</Display>
- <Value>45</Value>
- </Rotation>
- <Rotation>
- <Display>90 degrees</Display>
- <Value>90</Value>
- </Rotation>
-</ComboBoxDataSet>
Modified: trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml
===================================================================
--- trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Localization/fr-FR/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml 2009-12-24 11:02:34 UTC (rev 4471)
@@ -91,4 +91,56 @@
<Display>90 degrees</Display>
<Value>90</Value>
</Rotation>
+ <Rotation>
+ <Display>Expression...</Display>
+ <Value>Expression...</Value>
+ </Rotation>
+
+ <BackgroundType>
+ <Display>Ghosted</Display>
+ <Value>Ghosted</Value>
+ </BackgroundType>
+ <BackgroundType>
+ <Display>Opaque</Display>
+ <Value>Opaque</Value>
+ </BackgroundType>
+ <BackgroundType>
+ <Display>Transparent</Display>
+ <Value>Transparent</Value>
+ </BackgroundType>
+
+ <Vertical>
+ <Display>Baseline</Display>
+ <Value>'Baseline'</Value>
+ </Vertical>
+ <Vertical>
+ <Display>Bottom</Display>
+ <Value>'Bottom'</Value>
+ </Vertical>
+ <Vertical>
+ <Display>Capline</Display>
+ <Value>'Capline'</Value>
+ </Vertical>
+ <Vertical>
+ <Display>Halfline</Display>
+ <Value>'Halfline'</Value>
+ </Vertical>
+ <Vertical>
+ <Display>Top</Display>
+ <Value>'Top'</Value>
+ </Vertical>
+ <Vertical>
+ <Display>Expression...</Display>
+ <Value>Expression...</Value>
+ </Vertical>
+
+ <Horizontal>
+ <Display>Center</Display>
+ <Value>'Center'</Value>
+ </Horizontal>
+ <Horizontal>
+ <Display>Expression...</Display>
+ <Value>Expression...</Value>
+ </Horizontal>
+
</ComboBoxDataSet>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro/BrowseUnmanagedData.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/BrowseUnmanagedData.cs 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Maestro/BrowseUnmanagedData.cs 2009-12-24 11:02:34 UTC (rev 4471)
@@ -31,7 +31,7 @@
/// </summary>
public class BrowseUnmanagedData : System.Windows.Forms.Form
{
- private new System.Windows.Forms.Button CancelButton;
+ private new System.Windows.Forms.Button CancelBtn;
private System.Windows.Forms.Button OKButton;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Panel panel3;
@@ -138,7 +138,7 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BrowseUnmanagedData));
- this.CancelButton = new System.Windows.Forms.Button();
+ this.CancelBtn = new System.Windows.Forms.Button();
this.OKButton = new System.Windows.Forms.Button();
this.panel1 = new System.Windows.Forms.Panel();
this.panel3 = new System.Windows.Forms.Panel();
@@ -161,11 +161,11 @@
this.panel2.SuspendLayout();
this.SuspendLayout();
//
- // CancelButton
+ // CancelBtn
//
- resources.ApplyResources(this.CancelButton, "CancelButton");
- this.CancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.CancelButton.Name = "CancelButton";
+ resources.ApplyResources(this.CancelBtn, "CancelBtn");
+ this.CancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ this.CancelBtn.Name = "CancelBtn";
//
// OKButton
//
@@ -275,8 +275,7 @@
//
this.AcceptButton = this.OKButton;
resources.ApplyResources(this, "$this");
- this.CancelButton = this.CancelButton;
- this.Controls.Add(this.CancelButton);
+ this.Controls.Add(this.CancelBtn);
this.Controls.Add(this.OKButton);
this.Controls.Add(this.panel1);
this.Name = "BrowseUnmanagedData";
Modified: trunk/Tools/Maestro/Maestro/BrowseUnmanagedData.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/BrowseUnmanagedData.resx 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Maestro/BrowseUnmanagedData.resx 2009-12-24 11:02:34 UTC (rev 4471)
@@ -118,36 +118,36 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="CancelButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <data name="CancelBtn.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom</value>
</data>
- <data name="CancelButton.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
+ <data name="CancelBtn.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
<value>System</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="CancelButton.Location" type="System.Drawing.Point, System.Drawing">
+ <data name="CancelBtn.Location" type="System.Drawing.Point, System.Drawing">
<value>320, 478</value>
</data>
- <data name="CancelButton.Size" type="System.Drawing.Size, System.Drawing">
+ <data name="CancelBtn.Size" type="System.Drawing.Size, System.Drawing">
<value>80, 24</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="CancelButton.TabIndex" type="System.Int32, mscorlib">
+ <data name="CancelBtn.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
</data>
- <data name="CancelButton.Text" xml:space="preserve">
+ <data name="CancelBtn.Text" xml:space="preserve">
<value>Cancel</value>
</data>
- <data name=">>CancelButton.Name" xml:space="preserve">
- <value>CancelButton</value>
+ <data name=">>CancelBtn.Name" xml:space="preserve">
+ <value>CancelBtn</value>
</data>
- <data name=">>CancelButton.Type" xml:space="preserve">
+ <data name=">>CancelBtn.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>CancelButton.Parent" xml:space="preserve">
+ <data name=">>CancelBtn.Parent" xml:space="preserve">
<value>$this</value>
</data>
- <data name=">>CancelButton.ZOrder" xml:space="preserve">
+ <data name=">>CancelBtn.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="OKButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
@@ -503,43 +503,43 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABK
- CQAAAk1TRnQBSQFMAgEBAgEAARQBAAEUAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
- AwABEAMAAQEBAAEgBgABEP8AcwABqQGJAYQB/wHkAaEBSgH/AeQBoQFKAf8B2QGZAV0B/wHlAaQBUAH/
- AeQBoQFKAf8BygGJAWMB/4QAAYcBwgH4Af8BagHKAfsB/wElAcQB/QH/ASUBxAH9Af8BJQHEAf0B/wEl
- AcQB/QH/ARsBvgH9Af8BGwG+Af0B/wEbAb4B/QH/ARsBvgH9Af8BFAG7Af0B/wEUAbsB/QH/ARkBswH7
- Af8MAAGEAcQB9gH/AVUBuQH0Af8BrAHrAfoB/wHCAfAB+wH/AcIB8AH7Af8BwgHwAfsB/wHCAfAB+wH/
- AcIB8AH7Af8BxAGhAYMB/wHgAZUBNgH/Ad0BmAFJAf8B3AG1AaoB/wHVAY8BTAH/AeABlQE2Af8B0AGQ
- AV4B/4QAAZUBygH5Af8BhwHKAfkB/wE8AdkC/wE8AdkC/wEvAdIC/wEvAdIC/wEvAdIC/wEvAdIC/wEv
- AdIC/wEsAdEC/wEsAdEC/wEnAc8C/wEnAc8C/wF3Ab8B8QH/CAABiwHHAfYB/wGTAdsB+AH/AW0BzgH2
- Af8BoQHrAfoB/wGeAekB+gH/AZwB5gH6Af8BnAHmAfoB/wGTAdsB+AH/AawBqAGeAf8B2QGLAToB/wG2
- AYMBXAH/AZ0BtwHXAf8BrAGNAXoB/wHXAYgBNQH/AdEBnwGCAf+EAAGYAcsB+QH/AWoBvgH4Af8BdQHo
- Af4B/wFLAeEC/wFLAeEC/wFLAeEC/wFLAeEC/wFHAd8C/wFHAd8C/wFHAd8C/wE8AdkC/wFHAd8C/wFE
- AdcB/AH/AV0ByAH4Af8MAAGsAesB+gH/AU0BuAH0Af8BXAHbAfYB/wFQAdUB9QH/AUwB0AH1Af8BTAHQ
- AfUB/wFEAcUB9AH/AUYBugHoAf8BdAGRAZ4B/wFwAaoB4QH/AZQBzAH+Af8BeQG3Ae8B/wF4AZABnwH/
- AXQBnQHUAf+EAAGYAcsB+QH/AToBugH6Af8BlQHjAf0B/wFcAekC/wFcAekC/wFcAekC/wFcAekC/wFT
- AeUC/wFTAeUC/wFTAeUC/wFTAeUC/wFTAeUC/wFYAeEB/QH/AYQB6QH9Af8MAAGhAeQB+AH/AWEBwAH1
- Af8BUAHVAfUB/wE1AcsB8wH/AS0BwAHyAf8BKgG6AfEB/wEpAbgB8QH/ASkBuAHxAf8BMgGlAesB/wGE
- AcMB/gH/AXsBwAH+Af8BewHAAf4B/wFHAaoB7QH/AUMBrgHvAf+EAAGYAcsB+QH/ATcByQH9Af8BhwHK
- AfkB/wFvAe4C/wFvAe4C/wFvAe4C/wFrAe4C/wFrAe4C/wFrAe4C/wFkAe0C/wFkAe0C/wFkAe0C/wFr
- Ae4C/wGfAfwB/gH/AYEBwgHwAf8IAAGWAd0B9wH/AYoB3AH4Af8BTQG4AfQB/wEtAcAB8gH/AS0BwAHy
- Af8BKgG6AfEB/wEpAbgB8QH/AScBtQHxAf8BMgGpAfEB/wF1AbwB/gH/AW0BuAH+Af8BbQG4Af4B/wFP
- AZ4B6wH/AUgBmAHgAf8BcwGhAecB/4AAAZgBywH5Af8BTgHYAv8BSAG6AfgB/wHBAfQB/gH/AbUB9AH+
+ CQAAAk1TRnQBSQFMAgEBAgEAARwBAAEcAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ AwABEAMAAQEBAAEgBgABEP8AcwABqQGJAYQB/wHkAaEBSQH/AeQBoQFJAf8B2QGZAVwB/wHlAaQBTwH/
+ AeQBoQFJAf8BygGJAWIB/4QAAYcBwgH4Af8BaQHKAfsB/wEkAcQB/QH/ASQBxAH9Af8BJAHEAf0B/wEk
+ AcQB/QH/ARoBvgH9Af8BGgG+Af0B/wEaAb4B/QH/ARoBvgH9Af8BEwG7Af0B/wETAbsB/QH/ARgBswH7
+ Af8MAAGEAcQB9gH/AVQBuQH0Af8BrAHrAfoB/wHCAfAB+wH/AcIB8AH7Af8BwgHwAfsB/wHCAfAB+wH/
+ AcIB8AH7Af8BxAGhAYMB/wHgAZUBNQH/Ad0BmAFIAf8B3AG1AaoB/wHVAY8BSwH/AeABlQE1Af8B0AGQ
+ AV0B/4QAAZUBygH5Af8BhwHKAfkB/wE7AdkC/wE7AdkC/wEuAdIC/wEuAdIC/wEuAdIC/wEuAdIC/wEu
+ AdIC/wErAdEC/wErAdEC/wEmAc8C/wEmAc8C/wF2Ab8B8QH/CAABiwHHAfYB/wGTAdsB+AH/AWwBzgH2
+ Af8BoQHrAfoB/wGeAekB+gH/AZwB5gH6Af8BnAHmAfoB/wGTAdsB+AH/AawBqAGeAf8B2QGLATkB/wG2
+ AYMBWwH/AZ0BtwHXAf8BrAGNAXkB/wHXAYgBNAH/AdEBnwGCAf+EAAGYAcsB+QH/AWkBvgH4Af8BdAHo
+ Af4B/wFKAeEC/wFKAeEC/wFKAeEC/wFKAeEC/wFGAd8C/wFGAd8C/wFGAd8C/wE7AdkC/wFGAd8C/wFD
+ AdcB/AH/AVwByAH4Af8MAAGsAesB+gH/AUwBuAH0Af8BWwHbAfYB/wFPAdUB9QH/AUsB0AH1Af8BSwHQ
+ AfUB/wFDAcUB9AH/AUUBugHoAf8BcwGRAZ4B/wFvAaoB4QH/AZQBzAH+Af8BeAG3Ae8B/wF3AZABnwH/
+ AXMBnQHUAf+EAAGYAcsB+QH/ATkBugH6Af8BlQHjAf0B/wFbAekC/wFbAekC/wFbAekC/wFbAekC/wFS
+ AeUC/wFSAeUC/wFSAeUC/wFSAeUC/wFSAeUC/wFXAeEB/QH/AYQB6QH9Af8MAAGhAeQB+AH/AWABwAH1
+ Af8BTwHVAfUB/wE0AcsB8wH/ASwBwAHyAf8BKQG6AfEB/wEoAbgB8QH/ASgBuAHxAf8BMQGlAesB/wGE
+ AcMB/gH/AXoBwAH+Af8BegHAAf4B/wFGAaoB7QH/AUIBrgHvAf+EAAGYAcsB+QH/ATYByQH9Af8BhwHK
+ AfkB/wFuAe4C/wFuAe4C/wFuAe4C/wFqAe4C/wFqAe4C/wFqAe4C/wFjAe0C/wFjAe0C/wFjAe0C/wFq
+ Ae4C/wGfAfwB/gH/AYEBwgHwAf8IAAGWAd0B9wH/AYoB3AH4Af8BTAG4AfQB/wEsAcAB8gH/ASwBwAHy
+ Af8BKQG6AfEB/wEoAbgB8QH/ASYBtQHxAf8BMQGpAfEB/wF0AbwB/gH/AWwBuAH+Af8BbAG4Af4B/wFO
+ AZ4B6wH/AUcBmAHgAf8BcgGhAecB/4AAAZgBywH5Af8BTQHYAv8BRwG6AfgB/wHBAfQB/gH/AbUB9AH+
Af8BtQH0Af4B/wG1AfQB/gH/AaUB9AH+Af8BiQHzAv8BiQHzAv8BiQHzAv8BhQHzAv8BhAHpAf0B/wG0
- A/8BgAHUAfgB/wgAAYoB0wH2Af8BngHpAfoB/wFHAa4B8QH/AUQBxQH0Af8BQgG5AfEB/wFAAbQB8AH/
- AUABtAHwAf8BQAG0AfAB/wFAAbQB8AH/AVIBpAH5Af8BbwG4Af4B/wFjAbEB+gH/AVgBiQG8Af+IAAGY
- AcsB+QH/AWkB5QL/AUQB1wH8Af8BPwHBAfgB/wE/AcEB+AH/AT8BwQH4Af8BPwHBAfgB/wFzAcQB+AH/
- Ac0B9wH+Af8BzQH3Af4B/wHBAfQB/gH/AcUB9wH+Af8BwQH0Af4B/wHaAf0B/gH/AcEB9AH+Af8IAAF7
- AckB9QH/AaEB8QH6Af8BjAHhAfcB/wF1AcoB6wH/AVwBqAHOAf8BWwGmAc0B/wFbAaYBzQH/AVcBnwHN
- Af8BVwGfAc0B/wFgAacBygH/AVYBpgHTAf8BfQHDAdwB/wFkAZoB0AH/iAABmAHLAfkB/wGFAfMC/wFo
- AfAC/wFoAfAC/wFoAfAC/wFoAfAC/wFoAfAC/wFfAeIB/AH/AVkBzQH6Af8BWQHNAfoB/wFZAc0B+gH/
- AVkBzQH6Af8BUQG5AfgB/xAAAW4BvwHzAf8BoQHxAfoB/wGhAfEB+gH/AZwB7gH2Af8BeAHAAc4B/wF0
- AbwBywH/AXQBvAHLAf8BdAG8AcsB/wFvAbUBygH/AW8BtQHKAf8BcgG5AdEB/wGcAeYB+gH/AWsBrgHs
+ A/8BgAHUAfgB/wgAAYoB0wH2Af8BngHpAfoB/wFGAa4B8QH/AUMBxQH0Af8BQQG5AfEB/wE/AbQB8AH/
+ AT8BtAHwAf8BPwG0AfAB/wE/AbQB8AH/AVEBpAH5Af8BbgG4Af4B/wFiAbEB+gH/AVcBiQG8Af+IAAGY
+ AcsB+QH/AWgB5QL/AUMB1wH8Af8BPgHBAfgB/wE+AcEB+AH/AT4BwQH4Af8BPgHBAfgB/wFyAcQB+AH/
+ Ac0B9wH+Af8BzQH3Af4B/wHBAfQB/gH/AcUB9wH+Af8BwQH0Af4B/wHaAf0B/gH/AcEB9AH+Af8IAAF6
+ AckB9QH/AaEB8QH6Af8BjAHhAfcB/wF0AcoB6wH/AVsBqAHOAf8BWgGmAc0B/wFaAaYBzQH/AVYBnwHN
+ Af8BVgGfAc0B/wFfAacBygH/AVUBpgHTAf8BfAHDAdwB/wFjAZoB0AH/iAABmAHLAfkB/wGFAfMC/wFn
+ AfAC/wFnAfAC/wFnAfAC/wFnAfAC/wFnAfAC/wFeAeIB/AH/AVgBzQH6Af8BWAHNAfoB/wFYAc0B+gH/
+ AVgBzQH6Af8BUAG5AfgB/xAAAW0BvwHzAf8BoQHxAfoB/wGhAfEB+gH/AZwB7gH2Af8BdwHAAc4B/wFz
+ AbwBywH/AXMBvAHLAf8BcwG8AcsB/wFuAbUBygH/AW4BtQHKAf8BcQG5AdEB/wGcAeYB+gH/AWoBrgHs
Af+IAAGYAcsB+QH/AaQB/gL/AZAB/gL/AZAB/gL/AZAB/gL/AbQD/wG0A/8BtAP/AbQD/wG0A/8BtAP/
- AbQD/wF6Ac4B+gH/EAABbAG6AfEB/wGxAfMB+QH/AbEB8wH5Af8BsQHzAfkB/wGsAesB+gH/AasB7AH3
- Af8BqwHsAfcB/wGsAesB+gH/Aa8B5wH0Af8BsQHkAfQB/wGxAeQB9AH/AbEB5AH0Af8BegG7Ae8B/4gA
+ AbQD/wF5Ac4B+gH/EAABawG6AfEB/wGxAfMB+QH/AbEB8wH5Af8BsQHzAfkB/wGsAesB+gH/AasB7AH3
+ Af8BqwHsAfcB/wGsAesB+gH/Aa8B5wH0Af8BsQHkAfQB/wGxAeQB9AH/AbEB5AH0Af8BeQG7Ae8B/4gA
AZgBywH5Af8B1AP/AcoD/wHKA/8B1AP/AYcBwgH4Af8wAAGNAbwB8gH/AY0BvAHyAf8BjQG8AfIB/wwA
- AWABlAHPAf8B2AHzAfYB/wHpAfcB+AH/AekB9wH4Af8B6AH2AfcB/wGIAcEB7wH/jAABlQHKAfkB/wGY
- AcsB+QH/AZgBywH5Af8BkwHIAfkB/1AAAWwBnAHPAf8BbAGcAc8B/wFsAZwBzwH/AWoBlwHKAf8BcQGW
+ AV8BlAHPAf8B2AHzAfYB/wHpAfcB+AH/AekB9wH4Af8B6AH2AfcB/wGIAcEB7wH/jAABlQHKAfkB/wGY
+ AcsB+QH/AZgBywH5Af8BkwHIAfkB/1AAAWsBnAHPAf8BawGcAc8B/wFrAZwBzwH/AWkBlwHKAf8BcAGW
AcgB//8A/wD/AIsAAUIBTQE+BwABPgMAASgDAAFAAwABEAMAAQEBAAEBBQABgBcAA/8BAAT/BAAD/wEB
BQABBwEAAQEFAAEDAQABAQUAAQMBgAEBBQABAwGAAQEFAAEBAYAGAAEBAYABAwUAAQEBgAEDBQABBwGA
AQMFAAEHAYABAwQAAQMB/wHHAQMEAAGHAv8BgwQABP8EAAT/BAAE/wQACw==
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/AreaFeatureStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/AreaFeatureStyleEditor.cs 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/AreaFeatureStyleEditor.cs 2009-12-24 11:02:34 UTC (rev 4471)
@@ -60,8 +60,22 @@
public event EventHandler Changed;
- public AreaFeatureStyleEditor()
+ private EditorInterface m_editor;
+ private MaestroAPI.FeatureSourceDescription.FeatureSourceSchema m_schema;
+ private string m_featureSource;
+ private string m_providername;
+
+ public AreaFeatureStyleEditor(EditorInterface editor, MaestroAPI.FeatureSourceDescription.FeatureSourceSchema schema, string featureSource)
+ : this()
{
+ m_editor = editor;
+ m_schema = schema;
+ m_providername = m_editor.CurrentConnection.GetFeatureSource(featureSource).Provider;
+ m_featureSource = featureSource;
+ }
+
+ private AreaFeatureStyleEditor()
+ {
//
// Required for Windows Form Designer support
//
@@ -75,7 +89,8 @@
fillStyleEditor.backgroundColor.CurrentColorChanged += new EventHandler(backgroundColor_CurrentColorChanged);
lineStyleEditor.displayLine.CheckedChanged += new EventHandler(displayLine_CheckedChanged);
- lineStyleEditor.thicknessUpDown.ValueChanged += new EventHandler(thicknessCombo_SelectedIndexChanged);
+ lineStyleEditor.thicknessCombo.SelectedIndexChanged += new EventHandler(thicknessCombo_SelectedIndexChanged);
+ lineStyleEditor.thicknessCombo.TextChanged += new EventHandler(thicknessCombo_TextChanged);
lineStyleEditor.colorCombo.CurrentColorChanged += new EventHandler(colorCombo_CurrentColorChanged);
lineStyleEditor.fillCombo.SelectedIndexChanged += new EventHandler(fillCombo_Line_SelectedIndexChanged);
}
@@ -302,11 +317,7 @@
if (m_item.Stroke.ColorAsHTML != null)
lineStyleEditor.colorCombo.CurrentColor = m_item.Stroke.Color;
lineStyleEditor.fillCombo.SelectedIndex = lineStyleEditor.fillCombo.FindString(m_item.Stroke.LineStyle);
- double o;
- if (double.TryParse(m_item.Stroke.Thickness, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.InvariantCulture, out o))
- lineStyleEditor.thicknessUpDown.Value = (decimal)o;
- else
- lineStyleEditor.thicknessUpDown.Value = 0;
+ lineStyleEditor.thicknessCombo.Text = m_item.Stroke.Thickness;
}
m_inUpdate = true;
@@ -402,18 +413,6 @@
Changed(this, new EventArgs());
}
- private void thicknessCombo_SelectedIndexChanged(object sender, EventArgs e)
- {
- if (m_inUpdate)
- return;
-
- //TODO: Validate
- m_item.Stroke.Thickness = lineStyleEditor.thicknessUpDown.Value.ToString(System.Globalization.CultureInfo.InvariantCulture);
- previewPicture.Refresh();
- if (Changed != null)
- Changed(this, new EventArgs());
- }
-
private void colorCombo_CurrentColorChanged(object sender, EventArgs e)
{
if (m_inUpdate)
@@ -437,6 +436,38 @@
Changed(this, new EventArgs());
}
+ private void thicknessCombo_TextChanged(object sender, EventArgs e)
+ {
+ if (m_inUpdate || lineStyleEditor.thicknessCombo.SelectedIndex != -1)
+ return;
+
+ //TODO: Validate
+ m_item.Stroke.Thickness = lineStyleEditor.thicknessCombo.Text;
+ previewPicture.Refresh();
+ if (Changed != null)
+ Changed(this, new EventArgs());
+ }
+
+ private void thicknessCombo_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (m_inUpdate || lineStyleEditor.thicknessCombo.SelectedIndex != lineStyleEditor.thicknessCombo.Items.Count - 1)
+ return;
+
+ string current = null;
+ current = m_item.Stroke.Thickness;
+
+ string expr = null;
+ if (current != null)
+ {
+ expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource);
+ if (!string.IsNullOrEmpty(expr))
+ current = expr;
+ }
+
+ //This is required as we cannot update the text from within the SelectedIndexChanged event :(
+ BeginInvoke(new UpdateComboTextFromSelectChangedDelegate(UpdateComboTextFromSelectChanged), lineStyleEditor.thicknessCombo, current, expr != null);
+ }
+
internal void SetupForTheming()
{
fillStyleEditor.foregroundColor.Enabled =
@@ -444,5 +475,24 @@
fillStyleEditor.displayFill.Enabled =
false;
}
+
+ public delegate void UpdateComboTextFromSelectChangedDelegate(ComboBox owner, string text, bool userChange);
+
+ private void UpdateComboTextFromSelectChanged(ComboBox owner, string text, bool userChange)
+ {
+ try
+ {
+ if (!userChange)
+ m_inUpdate = true;
+ owner.SelectedIndex = -1;
+
+ owner.Text = text;
+ }
+ finally
+ {
+ if (!userChange)
+ m_inUpdate = false;
+ }
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FontStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FontStyleEditor.cs 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FontStyleEditor.cs 2009-12-24 11:02:34 UTC (rev 4471)
@@ -93,36 +93,54 @@
private Label label12;
private Label label11;
private ColorComboWithTransparency backgroundColor;
- private bool isUpdating = false;
+ private bool m_inUpdate = false;
public event EventHandler Changed;
- public FontStyleEditor()
+ private EditorInterface m_editor;
+ private MaestroAPI.FeatureSourceDescription.FeatureSourceSchema m_schema;
+ private string m_featureSource;
+ private string m_providername;
+
+ public FontStyleEditor(EditorInterface editor, MaestroAPI.FeatureSourceDescription.FeatureSourceSchema schema, string featureSource)
+ : this()
+ {
+ m_editor = editor;
+ m_schema = schema;
+ m_providername = m_editor.CurrentConnection.GetFeatureSource(featureSource).Provider;
+ m_featureSource = featureSource;
+
+ propertyCombo.Items.Clear();
+ foreach (MaestroAPI.FeatureSetColumn col in m_schema.Columns)
+ if (col.Type != MaestroAPI.Utility.GeometryType && col.Type != MaestroAPI.Utility.RasterType)
+ propertyCombo.Items.Add(col.Name);
+ propertyCombo.Items.Add(Strings.FontStyleEditor.ExpressionItem);
+
+ fontCombo.Items.Clear();
+ foreach (FontFamily f in new System.Drawing.Text.InstalledFontCollection().Families)
+ fontCombo.Items.Add(f.Name);
+
+ }
+
+ private FontStyleEditor()
{
//
// Required for Windows Form Designer support
//
InitializeComponent();
- using(System.IO.StringReader sr = new System.IO.StringReader(Properties.Resources.FontStyleComboDataset))
+ using(System.IO.StringReader sr = new System.IO.StringReader(Properties.Resources.GeometryStyleComboDataset))
ComboBoxDataSet.ReadXml(sr);
- }
+ }
- public void SetAvalibleColumns(string[] items)
- {
- propertyCombo.Items.Clear();
- if (items != null)
- propertyCombo.Items.AddRange(items);
- //propertyCombo.Items.Add("Expression...");
- }
private void UpdateDisplay()
{
- if (isUpdating)
+ if (m_inUpdate)
return;
try
{
- isUpdating = true;
+ m_inUpdate = true;
if (m_item == null)
{
@@ -135,7 +153,7 @@
propertyCombo.Text = m_item.Text;
propertyCombo.SelectedItem = m_item.Text;
if (m_item.FontName != null)
- fontCombo.SelectedValue = m_item.FontName;
+ fontCombo.Text = m_item.FontName;
sizeContextCombo.SelectedValue = m_item.SizeContext.ToString();
unitsCombo.SelectedValue = m_item.Unit.ToString();
if (m_item.SizeX == null)
@@ -156,7 +174,7 @@
}
finally
{
- isUpdating = false;
+ m_inUpdate = false;
}
}
@@ -195,9 +213,6 @@
this.dataColumn3 = new System.Data.DataColumn();
this.dataColumn4 = new System.Data.DataColumn();
this.fontCombo = new System.Windows.Forms.ComboBox();
- this.FontTable = new System.Data.DataTable();
- this.dataColumn1 = new System.Data.DataColumn();
- this.dataColumn2 = new System.Data.DataColumn();
this.propertyCombo = new System.Windows.Forms.ComboBox();
this.label6 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
@@ -209,6 +224,9 @@
this.underlineCheck = new System.Windows.Forms.CheckBox();
this.italicCheck = new System.Windows.Forms.CheckBox();
this.boldCheck = new System.Windows.Forms.CheckBox();
+ this.FontTable = new System.Data.DataTable();
+ this.dataColumn1 = new System.Data.DataColumn();
+ this.dataColumn2 = new System.Data.DataColumn();
this.colorGroup = new System.Windows.Forms.GroupBox();
this.label12 = new System.Windows.Forms.Label();
this.label11 = new System.Windows.Forms.Label();
@@ -244,8 +262,8 @@
this.fontGroup.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.UnitsTable)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.SizeContextTable)).BeginInit();
+ this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.FontTable)).BeginInit();
- this.panel1.SuspendLayout();
this.colorGroup.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.BackgroundTypeTable)).BeginInit();
this.alignmentGroup.SuspendLayout();
@@ -279,6 +297,8 @@
// sizeCombo
//
resources.ApplyResources(this.sizeCombo, "sizeCombo");
+ this.sizeCombo.Items.AddRange(new object[] {
+ resources.GetString("sizeCombo.Items")});
this.sizeCombo.Name = "sizeCombo";
this.sizeCombo.SelectedIndexChanged += new System.EventHandler(this.sizeCombo_SelectedIndexChanged);
this.sizeCombo.TextChanged += new System.EventHandler(this.sizeCombo_TextChanged);
@@ -340,30 +360,10 @@
// fontCombo
//
resources.ApplyResources(this.fontCombo, "fontCombo");
- this.fontCombo.DataSource = this.FontTable;
- this.fontCombo.DisplayMember = "Display";
this.fontCombo.Name = "fontCombo";
- this.fontCombo.ValueMember = "Value";
this.fontCombo.SelectedIndexChanged += new System.EventHandler(this.fontCombo_SelectedIndexChanged);
this.fontCombo.TextChanged += new System.EventHandler(this.fontCombo_TextChanged);
//
- // FontTable
- //
- this.FontTable.Columns.AddRange(new System.Data.DataColumn[] {
- this.dataColumn1,
- this.dataColumn2});
- this.FontTable.TableName = "Font";
- //
- // dataColumn1
- //
- this.dataColumn1.Caption = "Display";
- this.dataColumn1.ColumnName = "Display";
- //
- // dataColumn2
- //
- this.dataColumn2.Caption = "Value";
- this.dataColumn2.ColumnName = "Value";
- //
// propertyCombo
//
resources.ApplyResources(this.propertyCombo, "propertyCombo");
@@ -427,6 +427,23 @@
this.boldCheck.Name = "boldCheck";
this.boldCheck.CheckedChanged += new System.EventHandler(this.boldCheck_CheckedChanged);
//
+ // FontTable
+ //
+ this.FontTable.Columns.AddRange(new System.Data.DataColumn[] {
+ this.dataColumn1,
+ this.dataColumn2});
+ this.FontTable.TableName = "Font";
+ //
+ // dataColumn1
+ //
+ this.dataColumn1.Caption = "Display";
+ this.dataColumn1.ColumnName = "Display";
+ //
+ // dataColumn2
+ //
+ this.dataColumn2.Caption = "Value";
+ this.dataColumn2.ColumnName = "Value";
+ //
// colorGroup
//
resources.ApplyResources(this.colorGroup, "colorGroup");
@@ -525,6 +542,7 @@
this.rotationCombo.Name = "rotationCombo";
this.rotationCombo.ValueMember = "Value";
this.rotationCombo.SelectedIndexChanged += new System.EventHandler(this.rotationCombo_SelectedIndexChanged);
+ this.rotationCombo.TextChanged += new System.EventHandler(this.rotationCombo_TextChanged);
//
// RotationTable
//
@@ -548,10 +566,10 @@
resources.ApplyResources(this.verticalCombo, "verticalCombo");
this.verticalCombo.DataSource = this.VerticalTable;
this.verticalCombo.DisplayMember = "Display";
- this.verticalCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.verticalCombo.Name = "verticalCombo";
this.verticalCombo.ValueMember = "Value";
this.verticalCombo.SelectedIndexChanged += new System.EventHandler(this.verticalCombo_SelectedIndexChanged);
+ this.verticalCombo.TextChanged += new System.EventHandler(this.verticalCombo_TextChanged);
//
// VerticalTable
//
@@ -573,10 +591,10 @@
resources.ApplyResources(this.horizontalCombo, "horizontalCombo");
this.horizontalCombo.DataSource = this.HorizontalTable;
this.horizontalCombo.DisplayMember = "Display";
- this.horizontalCombo.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.horizontalCombo.Name = "horizontalCombo";
this.horizontalCombo.ValueMember = "Value";
this.horizontalCombo.SelectedIndexChanged += new System.EventHandler(this.horizontalCombo_SelectedIndexChanged);
+ this.horizontalCombo.TextChanged += new System.EventHandler(this.horizontalCombo_TextChanged);
//
// HorizontalTable
//
@@ -656,14 +674,16 @@
this.Controls.Add(this.alignmentGroup);
this.Name = "FontStyleEditor";
this.fontGroup.ResumeLayout(false);
+ this.fontGroup.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.UnitsTable)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.SizeContextTable)).EndInit();
+ this.panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.FontTable)).EndInit();
- this.panel1.ResumeLayout(false);
this.colorGroup.ResumeLayout(false);
this.colorGroup.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.BackgroundTypeTable)).EndInit();
this.alignmentGroup.ResumeLayout(false);
+ this.alignmentGroup.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.RotationTable)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.VerticalTable)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.HorizontalTable)).EndInit();
@@ -679,20 +699,23 @@
private void propertyCombo_SelectedIndexChanged(object sender, System.EventArgs e)
{
- if (isUpdating)
- return;
- m_item.Text = propertyCombo.Text; //(string)propertyCombo.SelectedItem;
- previewPicture.Refresh();
+ if (propertyCombo.SelectedIndex == propertyCombo.Items.Count - 1)
+ {
+ string current = m_item.Text;
+ string expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource);
+ if (!string.IsNullOrEmpty(expr))
+ current = expr;
- if (Changed != null)
- Changed(this, new EventArgs());
+ //This is required as we cannot update the text from within the SelectedIndexChanged event :(
+ BeginInvoke(new UpdateComboTextFromSelectChangedDelegate(UpdateComboTextFromSelectChanged), propertyCombo, current, expr != null);
+ }
}
private void fontCombo_SelectedIndexChanged(object sender, System.EventArgs e)
{
- if (isUpdating)
+ if (m_inUpdate)
return;
- m_item.FontName = (string)fontCombo.SelectedValue;
+ m_item.FontName = (string)fontCombo.Text;
previewPicture.Refresh();
if (Changed != null)
@@ -701,7 +724,7 @@
private void sizeContextCombo_SelectedIndexChanged(object sender, System.EventArgs e)
{
- if (isUpdating)
+ if (m_inUpdate)
return;
m_item.SizeContext = (OSGeo.MapGuide.MaestroAPI.SizeContextType)Enum.Parse(typeof(OSGeo.MapGuide.MaestroAPI.SizeContextType), (string)sizeContextCombo.SelectedValue);
previewPicture.Refresh();
@@ -712,7 +735,7 @@
private void unitsCombo_SelectedIndexChanged(object sender, System.EventArgs e)
{
- if (isUpdating)
+ if (m_inUpdate)
return;
m_item.Unit = (OSGeo.MapGuide.MaestroAPI.LengthUnitType)Enum.Parse(typeof(OSGeo.MapGuide.MaestroAPI.LengthUnitType), (string)unitsCombo.SelectedValue);
previewPicture.Refresh();
@@ -723,19 +746,21 @@
private void sizeCombo_SelectedIndexChanged(object sender, System.EventArgs e)
{
- if (isUpdating)
- return;
- //TODO: Validate
- m_item.SizeX = m_item.SizeY = sizeCombo.Text;
- previewPicture.Refresh();
+ if (sizeCombo.SelectedIndex == sizeCombo.Items.Count - 1)
+ {
+ string current = m_item.SizeX;
+ string expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource);
+ if (!string.IsNullOrEmpty(expr))
+ current = expr;
- if (Changed != null)
- Changed(this, new EventArgs());
- }
+ //This is required as we cannot update the text from within the SelectedIndexChanged event :(
+ BeginInvoke(new UpdateComboTextFromSelectChangedDelegate(UpdateComboTextFromSelectChanged), sizeCombo, current, expr != null);
+ }
+ }
private void boldCheck_CheckedChanged(object sender, System.EventArgs e)
{
- if (isUpdating)
+ if (m_inUpdate)
return;
m_item.Bold = boldCheck.Checked ? "true" : null;
previewPicture.Refresh();
@@ -746,7 +771,7 @@
private void italicCheck_CheckedChanged(object sender, System.EventArgs e)
{
- if (isUpdating)
+ if (m_inUpdate)
return;
m_item.Italic = italicCheck.Checked ? "true" : null;
previewPicture.Refresh();
@@ -757,7 +782,7 @@
private void underlineCheck_CheckedChanged(object sender, System.EventArgs e)
{
- if (isUpdating)
+ if (m_inUpdate)
return;
m_item.Underlined = underlineCheck.Checked ? "true" : null;
previewPicture.Refresh();
@@ -768,7 +793,7 @@
private void textColor_SelectedIndexChanged(object sender, System.EventArgs e)
{
- if (isUpdating)
+ if (m_inUpdate)
return;
m_item.ForegroundColor = textColor.CurrentColor;
previewPicture.Refresh();
@@ -779,7 +804,7 @@
private void backgroundColor_SelectedIndexChanged(object sender, System.EventArgs e)
{
- if (isUpdating)
+ if (m_inUpdate)
return;
m_item.BackgroundColor = backgroundColor.CurrentColor;
previewPicture.Refresh();
@@ -790,7 +815,7 @@
private void backgroundTypeCombo_SelectedIndexChanged(object sender, System.EventArgs e)
{
- if (isUpdating)
+ if (m_inUpdate)
return;
m_item.BackgroundStyle = (OSGeo.MapGuide.MaestroAPI.BackgroundStyleType)Enum.Parse(typeof(OSGeo.MapGuide.MaestroAPI.BackgroundStyleType), (string)backgroundTypeCombo.SelectedValue);
previewPicture.Refresh();
@@ -801,37 +826,60 @@
private void horizontalCombo_SelectedIndexChanged(object sender, System.EventArgs e)
{
- if (isUpdating)
- return;
- m_item.HorizontalAlignment = (string)horizontalCombo.SelectedValue;
- previewPicture.Refresh();
+ if (m_inUpdate)
+ return;
- if (Changed != null)
- Changed(this, new EventArgs());
- }
+ if (horizontalCombo.SelectedIndex == horizontalCombo.Items.Count - 1)
+ {
+ string current = m_item.HorizontalAlignment;
+ string expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource);
+ if (!string.IsNullOrEmpty(expr))
+ current = expr;
+ //This is required as we cannot update the text from within the SelectedIndexChanged event :(
+ BeginInvoke(new UpdateComboTextFromSelectChangedDelegate(UpdateComboTextFromSelectChanged), horizontalCombo, current, expr != null);
+ }
+ else if (horizontalCombo.SelectedIndex != -1)
+ {
+ m_item.HorizontalAlignment = (string)horizontalCombo.SelectedValue;
+ }
+ }
+
private void verticalCombo_SelectedIndexChanged(object sender, System.EventArgs e)
{
- if (isUpdating)
- return;
- m_item.VerticalAlignment = (string)verticalCombo.SelectedValue;
- previewPicture.Refresh();
+ if (verticalCombo.SelectedIndex == verticalCombo.Items.Count - 1)
+ {
+ string current = m_item.VerticalAlignment;
+ string expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource);
+ if (!string.IsNullOrEmpty(expr))
+ current = expr;
- if (Changed != null)
- Changed(this, new EventArgs());
- }
+ //This is required as we cannot update the text from within the SelectedIndexChanged event :(
+ BeginInvoke(new UpdateComboTextFromSelectChangedDelegate(UpdateComboTextFromSelectChanged), verticalCombo, current, expr != null);
+ }
+ else if (verticalCombo.SelectedIndex != -1)
+ {
+ m_item.VerticalAlignment = (string)verticalCombo.SelectedValue;
+ }
+ }
private void rotationCombo_SelectedIndexChanged(object sender, System.EventArgs e)
{
- if (isUpdating)
- return;
- //TODO: Validate
- m_item.Rotation = sizeCombo.Text;
- previewPicture.Refresh();
+ if (rotationCombo.SelectedIndex == rotationCombo.Items.Count - 1)
+ {
+ string current = m_item.Rotation;
+ string expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource);
+ if (!string.IsNullOrEmpty(expr))
+ current = expr;
- if (Changed != null)
- Changed(this, new EventArgs());
- }
+ //This is required as we cannot update the text from within the SelectedIndexChanged event :(
+ BeginInvoke(new UpdateComboTextFromSelectChangedDelegate(UpdateComboTextFromSelectChanged), rotationCombo, current, expr != null);
+ }
+ else if (rotationCombo.SelectedIndex != -1)
+ {
+ m_item.Rotation = (string)rotationCombo.SelectedValue;
+ }
+ }
private void previewPicture_Paint(object sender, System.Windows.Forms.PaintEventArgs e)
{
@@ -845,9 +893,16 @@
private void propertyCombo_TextChanged(object sender, System.EventArgs e)
{
- propertyCombo_SelectedIndexChanged(sender, e);
- }
+ if (m_inUpdate || propertyCombo.SelectedIndex == propertyCombo.Items.Count - 1)
+ return;
+ m_item.Text = propertyCombo.Text;
+ previewPicture.Refresh();
+
+ if (Changed != null)
+ Changed(this, new EventArgs());
+ }
+
public OSGeo.MapGuide.MaestroAPI.TextSymbolType Item
{
get { return m_item; }
@@ -863,7 +918,7 @@
foreach (Control c in this.Controls)
c.Enabled = c == DisplayLabel || DisplayLabel.Checked;
- if (isUpdating)
+ if (m_inUpdate)
return;
if (DisplayLabel.Checked)
@@ -883,7 +938,15 @@
private void sizeCombo_TextChanged(object sender, EventArgs e)
{
- sizeCombo_SelectedIndexChanged(sender, e);
+ if (m_inUpdate || sizeCombo.SelectedIndex != -1)
+ return;
+
+ //TODO: Validate
+ m_item.SizeX = m_item.SizeY = sizeCombo.Text;
+ previewPicture.Refresh();
+
+ if (Changed != null)
+ Changed(this, new EventArgs());
}
private void fontCombo_TextChanged(object sender, EventArgs e)
@@ -892,5 +955,61 @@
}
+ public delegate void UpdateComboTextFromSelectChangedDelegate(ComboBox owner, string text, bool userChange);
+
+ private void UpdateComboTextFromSelectChanged(ComboBox owner, string text, bool userChange)
+ {
+ try
+ {
+ if (!userChange)
+ m_inUpdate = true;
+ owner.SelectedIndex = -1;
+
+ owner.Text = text;
+ }
+ finally
+ {
+ if (!userChange)
+ m_inUpdate = false;
+ }
+ }
+
+ private void horizontalCombo_TextChanged(object sender, EventArgs e)
+ {
+ if (m_inUpdate || horizontalCombo.SelectedIndex != -1)
+ return;
+
+ m_item.HorizontalAlignment = (string)horizontalCombo.SelectedValue;
+ previewPicture.Refresh();
+
+ if (Changed != null)
+ Changed(this, new EventArgs());
+ }
+
+ private void verticalCombo_TextChanged(object sender, EventArgs e)
+ {
+ if (m_inUpdate || verticalCombo.SelectedIndex != -1)
+ return;
+
+ m_item.VerticalAlignment = (string)verticalCombo.SelectedValue;
+ previewPicture.Refresh();
+
+ if (Changed != null)
+ Changed(this, new EventArgs());
+ }
+
+ private void rotationCombo_TextChanged(object sender, EventArgs e)
+ {
+ if (m_inUpdate || rotationCombo.SelectedIndex != -1)
+ return;
+
+ //TODO: Validate
+ m_item.Rotation = sizeCombo.Text;
+ previewPicture.Refresh();
+
+ if (Changed != null)
+ Changed(this, new EventArgs());
+ }
+
}
}
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FontStyleEditor.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FontStyleEditor.resx 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FontStyleEditor.resx 2009-12-24 11:02:34 UTC (rev 4471)
@@ -124,6 +124,9 @@
<data name="sizeCombo.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
+ <data name="sizeCombo.Items" xml:space="preserve">
+ <value>Expression...</value>
+ </data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="sizeCombo.Location" type="System.Drawing.Point, System.Drawing">
<value>112, 144</value>
@@ -135,9 +138,6 @@
<data name="sizeCombo.TabIndex" type="System.Int32, mscorlib">
<value>10</value>
</data>
- <data name="sizeCombo.Text" xml:space="preserve">
- <value>comboBox5</value>
- </data>
<data name=">>sizeCombo.Name" xml:space="preserve">
<value>sizeCombo</value>
</data>
@@ -246,11 +246,14 @@
<data name=">>propertyCombo.ZOrder" xml:space="preserve">
<value>4</value>
</data>
+ <data name="label6.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
<data name="label6.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 176</value>
</data>
<data name="label6.Size" type="System.Drawing.Size, System.Drawing">
- <value>48, 16</value>
+ <value>30, 13</value>
</data>
<data name="label6.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@@ -270,11 +273,14 @@
<data name=">>label6.ZOrder" xml:space="preserve">
<value>5</value>
</data>
+ <data name="label5.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
<data name="label5.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 144</value>
</data>
<data name="label5.Size" type="System.Drawing.Size, System.Drawing">
- <value>72, 16</value>
+ <value>27, 13</value>
</data>
<data name="label5.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
@@ -294,11 +300,14 @@
<data name=">>label5.ZOrder" xml:space="preserve">
<value>6</value>
</data>
+ <data name="label4.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
<data name="label4.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 112</value>
</data>
<data name="label4.Size" type="System.Drawing.Size, System.Drawing">
- <value>88, 16</value>
+ <value>31, 13</value>
</data>
<data name="label4.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@@ -318,11 +327,14 @@
<data name=">>label4.ZOrder" xml:space="preserve">
<value>7</value>
</data>
+ <data name="label3.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
<data name="label3.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 80</value>
</data>
<data name="label3.Size" type="System.Drawing.Size, System.Drawing">
- <value>88, 16</value>
+ <value>65, 13</value>
</data>
<data name="label3.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@@ -342,11 +354,14 @@
<data name=">>label3.ZOrder" xml:space="preserve">
<value>8</value>
</data>
+ <data name="label2.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
<data name="label2.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 48</value>
</data>
<data name="label2.Size" type="System.Drawing.Size, System.Drawing">
- <value>64, 16</value>
+ <value>28, 13</value>
</data>
<data name="label2.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -366,11 +381,14 @@
<data name=">>label2.ZOrder" xml:space="preserve">
<value>9</value>
</data>
+ <data name="label1.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 16</value>
</data>
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
- <value>64, 16</value>
+ <value>46, 13</value>
</data>
<data name="label1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -625,7 +643,7 @@
<value>backgroundColor</value>
</data>
<data name=">>backgroundColor.Type" xml:space="preserve">
- <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboWithTransparency, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4358, Culture=neutral, PublicKeyToken=null</value>
+ <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboWithTransparency, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4437, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>backgroundColor.Parent" xml:space="preserve">
<value>colorGroup</value>
@@ -649,7 +667,7 @@
<value>textColor</value>
</data>
<data name=">>textColor.Type" xml:space="preserve">
- <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboWithTransparency, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4358, Culture=neutral, PublicKeyToken=null</value>
+ <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboWithTransparency, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4437, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>textColor.Parent" xml:space="preserve">
<value>colorGroup</value>
@@ -681,11 +699,14 @@
<data name=">>backgroundTypeCombo.ZOrder" xml:space="preserve">
<value>4</value>
</data>
+ <data name="label7.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
<data name="label7.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 130</value>
</data>
<data name="label7.Size" type="System.Drawing.Size, System.Drawing">
- <value>96, 16</value>
+ <value>88, 13</value>
</data>
<data name="label7.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@@ -705,11 +726,14 @@
<data name=">>label7.ZOrder" xml:space="preserve">
<value>5</value>
</data>
+ <data name="label8.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
<data name="label8.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 72</value>
</data>
<data name="label8.Size" type="System.Drawing.Size, System.Drawing">
- <value>80, 16</value>
+ <value>65, 13</value>
</data>
<data name="label8.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
@@ -729,11 +753,14 @@
<data name=">>label8.ZOrder" xml:space="preserve">
<value>6</value>
</data>
+ <data name="label9.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
<data name="label9.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 16</value>
</data>
<data name="label9.Size" type="System.Drawing.Size, System.Drawing">
- <value>64, 16</value>
+ <value>28, 13</value>
</data>
<data name="label9.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@@ -852,11 +879,14 @@
<data name=">>horizontalCombo.ZOrder" xml:space="preserve">
<value>2</value>
</data>
+ <data name="label10.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
<data name="label10.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 80</value>
</data>
<data name="label10.Size" type="System.Drawing.Size, System.Drawing">
- <value>96, 16</value>
+ <value>47, 13</value>
</data>
<data name="label10.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@@ -876,11 +906,14 @@
<data name=">>label10.ZOrder" xml:space="preserve">
<value>3</value>
</data>
+ <data name="verticalLabel.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
<data name="verticalLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 48</value>
</data>
<data name="verticalLabel.Size" type="System.Drawing.Size, System.Drawing">
- <value>80, 16</value>
+ <value>42, 13</value>
</data>
<data name="verticalLabel.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
@@ -900,11 +933,14 @@
<data name=">>verticalLabel.ZOrder" xml:space="preserve">
<value>4</value>
</data>
+ <data name="horizontalLabel.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
<data name="horizontalLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 16</value>
</data>
<data name="horizontalLabel.Size" type="System.Drawing.Size, System.Drawing">
- <value>64, 16</value>
+ <value>54, 13</value>
</data>
<data name="horizontalLabel.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineFeatureStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineFeatureStyleEditor.cs 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineFeatureStyleEditor.cs 2009-12-24 11:02:34 UTC (rev 4471)
@@ -59,14 +59,28 @@
private System.Data.DataTable UnitsTable;
private System.Data.DataColumn dataColumn5;
private System.Data.DataColumn dataColumn6;
- private bool isUpdating = false;
+ private bool m_inUpdate = false;
private ToolStrip toolStrip1;
private ToolStripButton AddStyleButton;
private ToolStripButton RemoveStyleButton;
public event EventHandler Changed;
- public LineFeatureStyleEditor()
+ private EditorInterface m_editor;
+ private MaestroAPI.FeatureSourceDescription.FeatureSourceSchema m_schema;
+ private string m_featureSource;
+ private string m_providername;
+
+ public LineFeatureStyleEditor(EditorInterface editor, MaestroAPI.FeatureSourceDescription.FeatureSourceSchema schema, string featureSource)
+ : this()
+ {
+ m_editor = editor;
+ m_schema = schema;
+ m_providername = m_editor.CurrentConnection.GetFeatureSource(featureSource).Provider;
+ m_featureSource = featureSource;
+ }
+
+ private LineFeatureStyleEditor()
{
//
// Required for Windows Form Designer support
@@ -76,8 +90,9 @@
ComboBoxDataSet.ReadXml(sr);
lineStyleEditor.displayLine.Visible = false;
- lineStyleEditor.thicknessUpDown.ValueChanged += new EventHandler(thicknessCombo_SelectedIndexChanged);
- lineStyleEditor.colorCombo.CurrentColorChanged += new EventHandler(colorCombo_CurrentValueChanged);
+ lineStyleEditor.thicknessCombo.SelectedIndexChanged += new EventHandler(thicknessCombo_SelectedIndexChanged);
+ lineStyleEditor.thicknessCombo.TextChanged += new EventHandler(thicknessCombo_TextChanged);
+ lineStyleEditor.colorCombo.CurrentColorChanged += new EventHandler(colorCombo_CurrentValueChanged);
lineStyleEditor.fillCombo.SelectedIndexChanged += new EventHandler(fillCombo_SelectedIndexChanged);
}
@@ -85,7 +100,7 @@
{
try
{
- isUpdating = true;
+ m_inUpdate = true;
applyLineStyle.Checked = (m_item != null && m_item.Count != 0);
lineStyles.Items.Clear();
@@ -102,17 +117,17 @@
}
finally
{
- isUpdating = false;
+ m_inUpdate = false;
}
}
private void UpdateDisplayForSelected()
{
- bool prevUpdate = isUpdating;
+ bool prevUpdate = m_inUpdate;
try
{
- isUpdating = true;
+ m_inUpdate = true;
OSGeo.MapGuide.MaestroAPI.StrokeType st = this.CurrentStrokeType;
sizeGroup.Enabled =
lineGroup.Enabled =
@@ -136,17 +151,14 @@
lineStyleEditor.fillCombo.SelectedItem = i;
break;
}
- double o;
- if (double.TryParse(st.Thickness, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.InvariantCulture, out o))
- lineStyleEditor.thicknessUpDown.Value = (decimal)o;
- else
- lineStyleEditor.thicknessUpDown.Value = 0;
+
+ lineStyleEditor.thicknessCombo.Text = st.Thickness;
}
previewPicture.Refresh();
}
finally
{
- isUpdating = prevUpdate;
+ m_inUpdate = prevUpdate;
}
}
@@ -430,6 +442,7 @@
this.propertyPanel.ResumeLayout(false);
this.lineGroup.ResumeLayout(false);
this.sizeGroup.ResumeLayout(false);
+ this.sizeGroup.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.UnitsTable)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.SizeContextTable)).EndInit();
this.previewGroup.ResumeLayout(false);
@@ -448,7 +461,7 @@
private void sizeContextCombo_SelectedIndexChanged(object sender, System.EventArgs e)
{
- if (isUpdating)
+ if (m_inUpdate)
return;
//TODO: Where does this go?
if (Changed != null)
@@ -457,7 +470,7 @@
private void sizeUnitsCombo_SelectedIndexChanged(object sender, System.EventArgs e)
{
- if (isUpdating || this.CurrentStrokeType == null)
+ if (m_inUpdate || this.CurrentStrokeType == null)
return;
this.CurrentStrokeType.Unit = (OSGeo.MapGuide.MaestroAPI.LengthUnitType)Enum.Parse(typeof(OSGeo.MapGuide.MaestroAPI.LengthUnitType), (string)sizeUnitsCombo.SelectedValue);
previewPicture.Refresh();
@@ -476,21 +489,35 @@
}
}
- private void thicknessCombo_SelectedIndexChanged(object sender, EventArgs e)
- {
- if (isUpdating || this.CurrentStrokeType == null)
- return;
- this.CurrentStrokeType.Thickness = lineStyleEditor.thicknessUpDown.Value.ToString(System.Globalization.CultureInfo.InvariantCulture);
+ private void thicknessCombo_TextChanged(object sender, EventArgs e)
+ {
+ if (m_inUpdate || lineStyleEditor.thicknessCombo.SelectedIndex != -1)
+ return;
- previewPicture.Refresh();
- lineStyles.Refresh();
- if (Changed != null)
- Changed(this, new EventArgs());
- }
+ //TODO: Validate
+ this.CurrentStrokeType.Thickness = lineStyleEditor.thicknessCombo.Text;
+ previewPicture.Refresh();
+ if (Changed != null)
+ Changed(this, new EventArgs());
+ }
+ private void thicknessCombo_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (m_inUpdate || lineStyleEditor.thicknessCombo.SelectedIndex != lineStyleEditor.thicknessCombo.Items.Count - 1)
+ return;
+
+ string current = this.CurrentStrokeType.Thickness;
+ string expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource);
+ if (!string.IsNullOrEmpty(expr))
+ current = expr;
+
+ //This is required as we cannot update the text from within the SelectedIndexChanged event :(
+ BeginInvoke(new UpdateComboTextFromSelectChangedDelegate(UpdateComboTextFromSelectChanged), lineStyleEditor.thicknessCombo, current, expr != null);
+ }
+
private void colorCombo_CurrentValueChanged(object sender, EventArgs e)
{
- if (isUpdating || this.CurrentStrokeType == null)
+ if (m_inUpdate || this.CurrentStrokeType == null)
return;
this.CurrentStrokeType.Color = lineStyleEditor.colorCombo.CurrentColor;
previewPicture.Refresh();
@@ -501,7 +528,7 @@
private void fillCombo_SelectedIndexChanged(object sender, EventArgs e)
{
- if (isUpdating || this.CurrentStrokeType == null)
+ if (m_inUpdate || this.CurrentStrokeType == null)
return;
if (lineStyleEditor.fillCombo.SelectedItem as ImageStylePicker.NamedImage != null)
@@ -521,7 +548,7 @@
previewGroup.Enabled =
applyLineStyle.Checked;
- if (!isUpdating)
+ if (!m_inUpdate)
{
if (!applyLineStyle.Checked)
{
@@ -536,7 +563,7 @@
m_item = new OSGeo.MapGuide.MaestroAPI.StrokeTypeCollection();
if (m_item.Count == 0)
- m_item.Add(new OSGeo.MapGuide.MaestroAPI.StrokeType());
+ m_item.Add(DefaultItemGenerator.CreateStrokeType());
UpdateDisplay();
}
@@ -552,7 +579,7 @@
compositePanel.Visible = compositeLines.Checked;
- if (isUpdating)
+ if (m_inUpdate)
return;
if (Changed != null)
Changed(this, new EventArgs());
@@ -591,12 +618,11 @@
private void AddStyleButton_Click(object sender, EventArgs e)
{
- m_item.Add(new OSGeo.MapGuide.MaestroAPI.StrokeType());
+ m_item.Add(DefaultItemGenerator.CreateStrokeType());
UpdateDisplay();
lineStyles.SelectedIndex = lineStyles.Items.Count - 1;
}
-
internal void SetupForTheming()
{
lineStyleEditor.colorCombo.Enabled =
@@ -604,5 +630,24 @@
AdvancedPanel.Enabled =
false;
}
+
+ public delegate void UpdateComboTextFromSelectChangedDelegate(ComboBox owner, string text, bool userChange);
+
+ private void UpdateComboTextFromSelectChanged(ComboBox owner, string text, bool userChange)
+ {
+ try
+ {
+ if (!userChange)
+ m_inUpdate = true;
+ owner.SelectedIndex = -1;
+
+ owner.Text = text;
+ }
+ finally
+ {
+ if (!userChange)
+ m_inUpdate = false;
+ }
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineFeatureStyleEditor.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineFeatureStyleEditor.resx 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineFeatureStyleEditor.resx 2009-12-24 11:02:34 UTC (rev 4471)
@@ -358,7 +358,7 @@
<value>lineStyleEditor</value>
</data>
<data name=">>lineStyleEditor.Type" xml:space="preserve">
- <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.LineStyleEditor, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4358, Culture=neutral, PublicKeyToken=null</value>
+ <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.LineStyleEditor, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4437, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>lineStyleEditor.Parent" xml:space="preserve">
<value>lineGroup</value>
@@ -441,11 +441,14 @@
<data name=">>sizeContextCombo.ZOrder" xml:space="preserve">
<value>1</value>
</data>
+ <data name="label3.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
<data name="label3.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 52</value>
</data>
<data name="label3.Size" type="System.Drawing.Size, System.Drawing">
- <value>88, 16</value>
+ <value>52, 13</value>
</data>
<data name="label3.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
@@ -465,11 +468,14 @@
<data name=">>label3.ZOrder" xml:space="preserve">
<value>2</value>
</data>
+ <data name="label2.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
<data name="label2.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 20</value>
</data>
<data name="label2.Size" type="System.Drawing.Size, System.Drawing">
- <value>72, 16</value>
+ <value>65, 13</value>
</data>
<data name="label2.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleEditor.cs 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleEditor.cs 2009-12-24 11:02:34 UTC (rev 4471)
@@ -37,10 +37,10 @@
private System.Windows.Forms.Label lblThickness;
private System.Windows.Forms.Label lblFill;
public System.Windows.Forms.CheckBox displayLine;
- private System.Windows.Forms.Panel panel1;
- public System.Windows.Forms.NumericUpDown thicknessUpDown;
+ private System.Windows.Forms.Panel panel1;
private Label label1;
public ColorComboWithTransparency colorCombo;
+ public ComboBox thicknessCombo;
/// <summary>
/// Required designer variable.
@@ -85,11 +85,10 @@
this.lblFill = new System.Windows.Forms.Label();
this.displayLine = new System.Windows.Forms.CheckBox();
this.panel1 = new System.Windows.Forms.Panel();
+ this.thicknessCombo = new System.Windows.Forms.ComboBox();
+ this.colorCombo = new OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboWithTransparency();
this.label1 = new System.Windows.Forms.Label();
- this.thicknessUpDown = new System.Windows.Forms.NumericUpDown();
- this.colorCombo = new OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboWithTransparency();
this.panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.thicknessUpDown)).BeginInit();
this.SuspendLayout();
//
// fillCombo
@@ -125,9 +124,9 @@
//
// panel1
//
+ this.panel1.Controls.Add(this.thicknessCombo);
this.panel1.Controls.Add(this.colorCombo);
this.panel1.Controls.Add(this.label1);
- this.panel1.Controls.Add(this.thicknessUpDown);
this.panel1.Controls.Add(this.fillCombo);
this.panel1.Controls.Add(this.lblColor);
this.panel1.Controls.Add(this.lblThickness);
@@ -135,22 +134,25 @@
resources.ApplyResources(this.panel1, "panel1");
this.panel1.Name = "panel1";
//
- // label1
+ // thicknessCombo
//
- resources.ApplyResources(this.label1, "label1");
- this.label1.Name = "label1";
+ resources.ApplyResources(this.thicknessCombo, "thicknessCombo");
+ this.thicknessCombo.FormattingEnabled = true;
+ this.thicknessCombo.Items.AddRange(new object[] {
+ resources.GetString("thicknessCombo.Items")});
+ this.thicknessCombo.Name = "thicknessCombo";
//
- // thicknessUpDown
- //
- resources.ApplyResources(this.thicknessUpDown, "thicknessUpDown");
- this.thicknessUpDown.Name = "thicknessUpDown";
- //
// colorCombo
//
resources.ApplyResources(this.colorCombo, "colorCombo");
this.colorCombo.CurrentColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
this.colorCombo.Name = "colorCombo";
//
+ // label1
+ //
+ resources.ApplyResources(this.label1, "label1");
+ this.label1.Name = "label1";
+ //
// LineStyleEditor
//
this.Controls.Add(this.panel1);
@@ -159,7 +161,7 @@
resources.ApplyResources(this, "$this");
this.Load += new System.EventHandler(this.LineStyleEditor_Load);
this.panel1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.thicknessUpDown)).EndInit();
+ this.panel1.PerformLayout();
this.ResumeLayout(false);
}
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleEditor.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleEditor.resx 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleEditor.resx 2009-12-24 11:02:34 UTC (rev 4471)
@@ -136,7 +136,7 @@
<value>fillCombo</value>
</data>
<data name=">>fillCombo.Type" xml:space="preserve">
- <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ImageStylePicker, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4358, Culture=neutral, PublicKeyToken=null</value>
+ <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ImageStylePicker, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4437, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>fillCombo.Parent" xml:space="preserve">
<value>panel1</value>
@@ -144,11 +144,14 @@
<data name=">>fillCombo.ZOrder" xml:space="preserve">
<value>3</value>
</data>
+ <data name="lblColor.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
<data name="lblColor.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 64</value>
</data>
<data name="lblColor.Size" type="System.Drawing.Size, System.Drawing">
- <value>96, 16</value>
+ <value>31, 13</value>
</data>
<data name="lblColor.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
@@ -168,11 +171,14 @@
<data name=">>lblColor.ZOrder" xml:space="preserve">
<value>4</value>
</data>
+ <data name="lblThickness.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
<data name="lblThickness.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 32</value>
</data>
<data name="lblThickness.Size" type="System.Drawing.Size, System.Drawing">
- <value>96, 16</value>
+ <value>56, 13</value>
</data>
<data name="lblThickness.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
@@ -192,11 +198,14 @@
<data name=">>lblThickness.ZOrder" xml:space="preserve">
<value>5</value>
</data>
+ <data name="lblFill.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
<data name="lblFill.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 8</value>
</data>
<data name="lblFill.Size" type="System.Drawing.Size, System.Drawing">
- <value>96, 16</value>
+ <value>51, 13</value>
</data>
<data name="lblFill.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
@@ -246,6 +255,33 @@
<data name=">>displayLine.ZOrder" xml:space="preserve">
<value>1</value>
</data>
+ <data name="thicknessCombo.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Left, Right</value>
+ </data>
+ <data name="thicknessCombo.Items" xml:space="preserve">
+ <value>Expression...</value>
+ </data>
+ <data name="thicknessCombo.Location" type="System.Drawing.Point, System.Drawing">
+ <value>120, 32</value>
+ </data>
+ <data name="thicknessCombo.Size" type="System.Drawing.Size, System.Drawing">
+ <value>312, 21</value>
+ </data>
+ <data name="thicknessCombo.TabIndex" type="System.Int32, mscorlib">
+ <value>15</value>
+ </data>
+ <data name=">>thicknessCombo.Name" xml:space="preserve">
+ <value>thicknessCombo</value>
+ </data>
+ <data name=">>thicknessCombo.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>thicknessCombo.Parent" xml:space="preserve">
+ <value>panel1</value>
+ </data>
+ <data name=">>thicknessCombo.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
<data name="colorCombo.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
@@ -262,14 +298,17 @@
<value>colorCombo</value>
</data>
<data name=">>colorCombo.Type" xml:space="preserve">
- <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboWithTransparency, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4358, Culture=neutral, PublicKeyToken=null</value>
+ <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboWithTransparency, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4437, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>colorCombo.Parent" xml:space="preserve">
<value>panel1</value>
</data>
<data name=">>colorCombo.ZOrder" xml:space="preserve">
- <value>0</value>
+ <value>1</value>
</data>
+ <data name="label1.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
<data name="label1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
@@ -277,7 +316,7 @@
<value>0, 96</value>
</data>
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
- <value>104, 16</value>
+ <value>72, 13</value>
</data>
<data name="label1.TabIndex" type="System.Int32, mscorlib">
<value>13</value>
@@ -295,30 +334,6 @@
<value>panel1</value>
</data>
<data name=">>label1.ZOrder" xml:space="preserve">
- <value>1</value>
- </data>
- <data name="thicknessUpDown.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
- <value>Top, Left, Right</value>
- </data>
- <data name="thicknessUpDown.Location" type="System.Drawing.Point, System.Drawing">
- <value>120, 32</value>
- </data>
- <data name="thicknessUpDown.Size" type="System.Drawing.Size, System.Drawing">
- <value>312, 20</value>
- </data>
- <data name="thicknessUpDown.TabIndex" type="System.Int32, mscorlib">
- <value>12</value>
- </data>
- <data name=">>thicknessUpDown.Name" xml:space="preserve">
- <value>thicknessUpDown</value>
- </data>
- <data name=">>thicknessUpDown.Type" xml:space="preserve">
- <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>thicknessUpDown.Parent" xml:space="preserve">
- <value>panel1</value>
- </data>
- <data name=">>thicknessUpDown.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/PointFeatureStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/PointFeatureStyleEditor.cs 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/PointFeatureStyleEditor.cs 2009-12-24 11:02:34 UTC (rev 4471)
@@ -100,7 +100,21 @@
public event EventHandler Changed;
- public PointFeatureStyleEditor()
+ private EditorInterface m_editor;
+ private MaestroAPI.FeatureSourceDescription.FeatureSourceSchema m_schema;
+ private string m_featureSource;
+ private string m_providername;
+
+ public PointFeatureStyleEditor(EditorInterface editor, MaestroAPI.FeatureSourceDescription.FeatureSourceSchema schema, string featureSource)
+ : this()
+ {
+ m_editor = editor;
+ m_schema = schema;
+ m_providername = m_editor.CurrentConnection.GetFeatureSource(featureSource).Provider;
+ m_featureSource = featureSource;
+ }
+
+ private PointFeatureStyleEditor()
{
//
// Required for Windows Form Designer support
@@ -121,7 +135,8 @@
fillStyleEditor.backgroundColor.CurrentColorChanged +=new EventHandler(backgroundColor_CurrentColorChanged);
lineStyleEditor.displayLine.CheckedChanged +=new EventHandler(displayLine_CheckedChanged);
- lineStyleEditor.thicknessUpDown.ValueChanged +=new EventHandler(thicknessCombo_SelectedIndexChanged);
+ lineStyleEditor.thicknessCombo.SelectedIndexChanged += new EventHandler(thicknessCombo_SelectedIndexChanged);
+ lineStyleEditor.thicknessCombo.TextChanged += new EventHandler(thicknessCombo_TextChanged);
lineStyleEditor.colorCombo.CurrentColorChanged +=new EventHandler(colorCombo_CurrentColorChanged);
lineStyleEditor.fillCombo.SelectedIndexChanged +=new EventHandler(fillCombo_Line_SelectedIndexChanged);
@@ -202,11 +217,7 @@
lineStyleEditor.fillCombo.SelectedIndex = lineStyleEditor.fillCombo.FindString(t.Edge.LineStyle);
lineStyleEditor.colorCombo.CurrentColor = t.Edge.Color;
- double o;
- if (double.TryParse(t.Edge.Thickness, System.Globalization.NumberStyles.Any, System.Globalization.CultureInfo.InvariantCulture, out o))
- lineStyleEditor.thicknessUpDown.Value = (decimal)o;
- else
- lineStyleEditor.thicknessUpDown.Value = 0;
+ lineStyleEditor.thicknessCombo.Text = t.Edge.Thickness;
}
setUIForMarkSymbol(true);
@@ -307,6 +318,8 @@
this.ComboBoxDataSet = new System.Data.DataSet();
this.DisplayPoints = new System.Windows.Forms.CheckBox();
this.groupBoxFont = new System.Windows.Forms.GroupBox();
+ this.label11 = new System.Windows.Forms.Label();
+ this.colorFontForeground = new OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboWithTransparency();
this.panel1 = new System.Windows.Forms.Panel();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.FontBoldButton = new System.Windows.Forms.ToolStripButton();
@@ -324,8 +337,6 @@
this.label7 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.MaintainAspectRatio = new System.Windows.Forms.CheckBox();
- this.colorFontForeground = new OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboWithTransparency();
- this.label11 = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.RotationTable)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.UnitsTable)).BeginInit();
@@ -368,7 +379,7 @@
this.RotationBox.Name = "RotationBox";
this.RotationBox.ValueMember = "Value";
this.RotationBox.SelectedIndexChanged += new System.EventHandler(this.RotationBox_SelectedIndexChanged);
- this.RotationBox.TextChanged += new System.EventHandler(this.Rotation_TextChanged);
+ this.RotationBox.TextChanged += new System.EventHandler(this.RotationBox_TextChanged);
//
// RotationTable
//
@@ -395,6 +406,8 @@
// HeigthText
//
resources.ApplyResources(this.HeigthText, "HeigthText");
+ this.HeigthText.Items.AddRange(new object[] {
+ resources.GetString("HeigthText.Items")});
this.HeigthText.Name = "HeigthText";
this.HeigthText.SelectedIndexChanged += new System.EventHandler(this.HeigthText_SelectedIndexChanged);
this.HeigthText.TextChanged += new System.EventHandler(this.HeigthText_TextChanged);
@@ -402,6 +415,8 @@
// WidthText
//
resources.ApplyResources(this.WidthText, "WidthText");
+ this.WidthText.Items.AddRange(new object[] {
+ resources.GetString("WidthText.Items")});
this.WidthText.Name = "WidthText";
this.WidthText.SelectedIndexChanged += new System.EventHandler(this.WidthText_SelectedIndexChanged);
this.WidthText.TextChanged += new System.EventHandler(this.WidthText_TextChanged);
@@ -584,6 +599,17 @@
this.groupBoxFont.Name = "groupBoxFont";
this.groupBoxFont.TabStop = false;
//
+ // label11
+ //
+ resources.ApplyResources(this.label11, "label11");
+ this.label11.Name = "label11";
+ //
+ // colorFontForeground
+ //
+ resources.ApplyResources(this.colorFontForeground, "colorFontForeground");
+ this.colorFontForeground.CurrentColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+ this.colorFontForeground.Name = "colorFontForeground";
+ //
// panel1
//
this.panel1.Controls.Add(this.toolStrip1);
@@ -700,17 +726,6 @@
resources.ApplyResources(this.MaintainAspectRatio, "MaintainAspectRatio");
this.MaintainAspectRatio.Name = "MaintainAspectRatio";
//
- // colorFontForeground
- //
- resources.ApplyResources(this.colorFontForeground, "colorFontForeground");
- this.colorFontForeground.CurrentColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
- this.colorFontForeground.Name = "colorFontForeground";
- //
- // label11
- //
- resources.ApplyResources(this.label11, "label11");
- this.label11.Name = "label11";
- //
// PointFeatureStyleEditor
//
resources.ApplyResources(this, "$this");
@@ -724,6 +739,7 @@
this.Name = "PointFeatureStyleEditor";
this.Load += new System.EventHandler(this.PointFeatureStyleEditor_Load);
this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.RotationTable)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.UnitsTable)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.SizeContextTable)).EndInit();
@@ -837,10 +853,10 @@
if (m_inUpdate)
return;
- if (m_item.Item.GetType() == typeof(OSGeo.MapGuide.MaestroAPI.MarkSymbolType))
- ((OSGeo.MapGuide.MaestroAPI.MarkSymbolType)m_item.Item).SizeContext = (OSGeo.MapGuide.MaestroAPI.SizeContextType)Enum.Parse((typeof(OSGeo.MapGuide.MaestroAPI.SizeContextType)), (string)SizeContext.SelectedValue);
- else if (m_item.Item.GetType() == typeof(OSGeo.MapGuide.MaestroAPI.FontSymbolType))
- ((OSGeo.MapGuide.MaestroAPI.FontSymbolType)m_item.Item).SizeContext = (OSGeo.MapGuide.MaestroAPI.SizeContextType)Enum.Parse((typeof(OSGeo.MapGuide.MaestroAPI.SizeContextType)), (string)SizeContext.SelectedValue);
+ if (m_item.Item.GetType() == typeof(OSGeo.MapGuide.MaestroAPI.MarkSymbolType))
+ ((OSGeo.MapGuide.MaestroAPI.MarkSymbolType)m_item.Item).SizeContext = (OSGeo.MapGuide.MaestroAPI.SizeContextType)Enum.Parse((typeof(OSGeo.MapGuide.MaestroAPI.SizeContextType)), (string)SizeContext.SelectedValue);
+ else if (m_item.Item.GetType() == typeof(OSGeo.MapGuide.MaestroAPI.FontSymbolType))
+ ((OSGeo.MapGuide.MaestroAPI.FontSymbolType)m_item.Item).SizeContext = (OSGeo.MapGuide.MaestroAPI.SizeContextType)Enum.Parse((typeof(OSGeo.MapGuide.MaestroAPI.SizeContextType)), (string)SizeContext.SelectedValue);
previewPicture.Refresh();
if (Changed != null)
Changed(this, new EventArgs());
@@ -860,19 +876,49 @@
Changed(this, new EventArgs());
}
+ public delegate void UpdateComboTextFromSelectChangedDelegate(ComboBox owner, string text, bool userChange);
+
+ private void UpdateComboTextFromSelectChanged(ComboBox owner, string text, bool userChange)
+ {
+ try
+ {
+ if (!userChange)
+ m_inUpdate = true;
+ owner.SelectedIndex = -1;
+
+ owner.Text = text;
+ }
+ finally
+ {
+ if (!userChange)
+ m_inUpdate = false;
+ }
+ }
+
private void WidthText_SelectedIndexChanged(object sender, System.EventArgs e)
{
if (m_inUpdate)
return;
- //TODO: Validate
- if (m_item.Item.GetType() == typeof(OSGeo.MapGuide.MaestroAPI.MarkSymbolType))
- ((OSGeo.MapGuide.MaestroAPI.MarkSymbolType)m_item.Item).SizeX = WidthText.Text;
- else if (m_item.Item.GetType() == typeof(OSGeo.MapGuide.MaestroAPI.FontSymbolType))
- ((OSGeo.MapGuide.MaestroAPI.FontSymbolType)m_item.Item).SizeX = WidthText.Text;
- previewPicture.Refresh();
- if (Changed != null)
- Changed(this, new EventArgs());
+ if (WidthText.SelectedIndex == WidthText.Items.Count - 1)
+ {
+ string current = null;
+ if (m_item.Item.GetType() == typeof(OSGeo.MapGuide.MaestroAPI.MarkSymbolType))
+ current = ((OSGeo.MapGuide.MaestroAPI.MarkSymbolType)m_item.Item).SizeX;
+ else if (m_item.Item.GetType() == typeof(OSGeo.MapGuide.MaestroAPI.FontSymbolType))
+ current = ((OSGeo.MapGuide.MaestroAPI.FontSymbolType)m_item.Item).SizeX;
+
+ string expr = null;
+ if (current != null)
+ {
+ expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource);
+ if (!string.IsNullOrEmpty(expr))
+ current = expr;
+ }
+
+ //This is required as we cannot update the text from within the SelectedIndexChanged event :(
+ BeginInvoke(new UpdateComboTextFromSelectChangedDelegate(UpdateComboTextFromSelectChanged), WidthText, current, expr != null);
+ }
}
private void HeigthText_SelectedIndexChanged(object sender, System.EventArgs e)
@@ -880,14 +926,25 @@
if (m_inUpdate)
return;
- //TODO: Validate
- if (m_item.Item.GetType() == typeof(OSGeo.MapGuide.MaestroAPI.MarkSymbolType))
- ((OSGeo.MapGuide.MaestroAPI.MarkSymbolType)m_item.Item).SizeY = HeigthText.Text;
- else if (m_item.Item.GetType() == typeof(OSGeo.MapGuide.MaestroAPI.FontSymbolType))
- ((OSGeo.MapGuide.MaestroAPI.FontSymbolType)m_item.Item).SizeY = HeigthText.Text;
- previewPicture.Refresh();
- if (Changed != null)
- Changed(this, new EventArgs());
+ if (HeigthText.SelectedIndex == HeigthText.Items.Count - 1)
+ {
+ string current = null;
+ if (m_item.Item.GetType() == typeof(OSGeo.MapGuide.MaestroAPI.MarkSymbolType))
+ current = ((OSGeo.MapGuide.MaestroAPI.MarkSymbolType)m_item.Item).SizeY;
+ else if (m_item.Item.GetType() == typeof(OSGeo.MapGuide.MaestroAPI.FontSymbolType))
+ current = ((OSGeo.MapGuide.MaestroAPI.FontSymbolType)m_item.Item).SizeY;
+
+ string expr = null;
+ if (current != null)
+ {
+ expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource);
+ if (!string.IsNullOrEmpty(expr))
+ current = expr;
+ }
+
+ //This is required as we cannot update the text from within the SelectedIndexChanged event :(
+ BeginInvoke(new UpdateComboTextFromSelectChangedDelegate(UpdateComboTextFromSelectChanged), HeigthText, current, expr != null);
+ }
}
private void ReferenceX_TextChanged(object sender, System.EventArgs e)
@@ -935,14 +992,35 @@
if (m_inUpdate)
return;
- //TODO: Validate
- if (m_item.Item.GetType() == typeof(OSGeo.MapGuide.MaestroAPI.MarkSymbolType))
- ((OSGeo.MapGuide.MaestroAPI.MarkSymbolType)m_item.Item).Rotation = (string)RotationBox.Text;
- else if (m_item.Item.GetType() == typeof(OSGeo.MapGuide.MaestroAPI.FontSymbolType))
- ((OSGeo.MapGuide.MaestroAPI.FontSymbolType)m_item.Item).Rotation = (string)RotationBox.Text;
- previewPicture.Refresh();
- if (Changed != null)
- Changed(this, new EventArgs());
+ if (RotationBox.SelectedIndex == RotationBox.Items.Count - 1)
+ {
+ string current = null;
+ if (m_item.Item.GetType() == typeof(OSGeo.MapGuide.MaestroAPI.MarkSymbolType))
+ current = ((OSGeo.MapGuide.MaestroAPI.MarkSymbolType)m_item.Item).Rotation;
+ else if (m_item.Item.GetType() == typeof(OSGeo.MapGuide.MaestroAPI.FontSymbolType))
+ current = ((OSGeo.MapGuide.MaestroAPI.FontSymbolType)m_item.Item).Rotation;
+
+ string expr = null;
+ if (current != null)
+ {
+ expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource);
+ if (!string.IsNullOrEmpty(expr))
+ current = expr;
+ }
+
+ //This is required as we cannot update the text from within the SelectedIndexChanged event :(
+ BeginInvoke(new UpdateComboTextFromSelectChangedDelegate(UpdateComboTextFromSelectChanged), RotationBox, current, expr != null);
+ }
+ else if (RotationBox.SelectedIndex != -1)
+ {
+ if (m_item.Item.GetType() == typeof(OSGeo.MapGuide.MaestroAPI.MarkSymbolType))
+ ((OSGeo.MapGuide.MaestroAPI.MarkSymbolType)m_item.Item).Rotation = (string)RotationBox.SelectedValue;
+ else if (m_item.Item.GetType() == typeof(OSGeo.MapGuide.MaestroAPI.FontSymbolType))
+ ((OSGeo.MapGuide.MaestroAPI.FontSymbolType)m_item.Item).Rotation = (string)RotationBox.SelectedValue;
+
+ //RotationBox.SelectedIndex = -1;
+ }
+
}
private void displayFill_CheckedChanged(object sender, EventArgs e)
@@ -1019,19 +1097,41 @@
Changed(this, new EventArgs());
}
- private void thicknessCombo_SelectedIndexChanged(object sender, EventArgs e)
+
+ private void thicknessCombo_TextChanged(object sender, EventArgs e)
+ {
+ if (m_inUpdate || lineStyleEditor.thicknessCombo.SelectedIndex != -1)
+ return;
+
+ //TODO: Validate
+ if (m_item.Item.GetType() == typeof(OSGeo.MapGuide.MaestroAPI.MarkSymbolType))
+ ((OSGeo.MapGuide.MaestroAPI.MarkSymbolType)m_item.Item).Edge.Thickness = lineStyleEditor.thicknessCombo.Text;
+ previewPicture.Refresh();
+ if (Changed != null)
+ Changed(this, new EventArgs());
+ }
+
+ private void thicknessCombo_SelectedIndexChanged(object sender, EventArgs e)
{
- if (m_inUpdate)
+ if (m_inUpdate || lineStyleEditor.thicknessCombo.SelectedIndex != lineStyleEditor.thicknessCombo.Items.Count - 1)
return;
- //TODO: Validate
- if (m_item.Item.GetType() == typeof(OSGeo.MapGuide.MaestroAPI.MarkSymbolType))
- ((OSGeo.MapGuide.MaestroAPI.MarkSymbolType) m_item.Item).Edge.Thickness = lineStyleEditor.thicknessUpDown.Value.ToString(System.Globalization.CultureInfo.InvariantCulture);
- previewPicture.Refresh();
- if (Changed != null)
- Changed(this, new EventArgs());
- }
+ string current = null;
+ if (m_item.Item.GetType() == typeof(OSGeo.MapGuide.MaestroAPI.MarkSymbolType))
+ current = ((OSGeo.MapGuide.MaestroAPI.MarkSymbolType)m_item.Item).Edge.Thickness;
+ string expr = null;
+ if (current != null)
+ {
+ expr = m_editor.EditExpression(current, m_schema, m_providername, m_featureSource);
+ if (!string.IsNullOrEmpty(expr))
+ current = expr;
+ }
+
+ //This is required as we cannot update the text from within the SelectedIndexChanged event :(
+ BeginInvoke(new UpdateComboTextFromSelectChangedDelegate(UpdateComboTextFromSelectChanged), lineStyleEditor.thicknessCombo, current, expr != null);
+ }
+
private void colorCombo_CurrentColorChanged(object sender, EventArgs e)
{
if (m_inUpdate)
@@ -1154,17 +1254,47 @@
private void WidthText_TextChanged(object sender, EventArgs e)
{
- WidthText_SelectedIndexChanged(sender, e);
+ if (m_inUpdate || WidthText.SelectedIndex != -1)
+ return;
+
+ //TODO: Validate
+ if (m_item.Item.GetType() == typeof(OSGeo.MapGuide.MaestroAPI.MarkSymbolType))
+ ((OSGeo.MapGuide.MaestroAPI.MarkSymbolType)m_item.Item).SizeX = WidthText.Text;
+ else if (m_item.Item.GetType() == typeof(OSGeo.MapGuide.MaestroAPI.FontSymbolType))
+ ((OSGeo.MapGuide.MaestroAPI.FontSymbolType)m_item.Item).SizeX = WidthText.Text;
+ previewPicture.Refresh();
+ if (Changed != null)
+ Changed(this, new EventArgs());
}
private void HeigthText_TextChanged(object sender, EventArgs e)
{
- HeigthText_SelectedIndexChanged(sender, e);
+ if (m_inUpdate || HeigthText.SelectedIndex != -1)
+ return;
+
+ //TODO: Validate
+ if (m_item.Item.GetType() == typeof(OSGeo.MapGuide.MaestroAPI.MarkSymbolType))
+ ((OSGeo.MapGuide.MaestroAPI.MarkSymbolType)m_item.Item).SizeY = HeigthText.Text;
+ else if (m_item.Item.GetType() == typeof(OSGeo.MapGuide.MaestroAPI.FontSymbolType))
+ ((OSGeo.MapGuide.MaestroAPI.FontSymbolType)m_item.Item).SizeY = HeigthText.Text;
+ previewPicture.Refresh();
+ if (Changed != null)
+ Changed(this, new EventArgs());
}
- private void Rotation_TextChanged(object sender, EventArgs e)
+ private void RotationBox_TextChanged(object sender, EventArgs e)
{
- RotationBox_SelectedIndexChanged(sender, e);
+ if (m_inUpdate || RotationBox.SelectedIndex != -1)
+ return;
+
+ //TODO: Validate
+ if (m_item.Item.GetType() == typeof(OSGeo.MapGuide.MaestroAPI.MarkSymbolType))
+ ((OSGeo.MapGuide.MaestroAPI.MarkSymbolType)m_item.Item).Rotation = (string)RotationBox.Text;
+ else if (m_item.Item.GetType() == typeof(OSGeo.MapGuide.MaestroAPI.FontSymbolType))
+ ((OSGeo.MapGuide.MaestroAPI.FontSymbolType)m_item.Item).Rotation = (string)RotationBox.Text;
+ previewPicture.Refresh();
+ if (Changed != null)
+ Changed(this, new EventArgs());
}
private void ReferenceY_Leave(object sender, EventArgs e)
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/PointFeatureStyleEditor.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/PointFeatureStyleEditor.resx 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/PointFeatureStyleEditor.resx 2009-12-24 11:02:34 UTC (rev 4471)
@@ -147,11 +147,14 @@
<data name=">>RotationBox.ZOrder" xml:space="preserve">
<value>0</value>
</data>
+ <data name="label9.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
<data name="label9.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 184</value>
</data>
<data name="label9.Size" type="System.Drawing.Size, System.Drawing">
- <value>88, 16</value>
+ <value>47, 13</value>
</data>
<data name="label9.TabIndex" type="System.Int32, mscorlib">
<value>28</value>
@@ -174,6 +177,9 @@
<data name="HeigthText.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
+ <data name="HeigthText.Items" xml:space="preserve">
+ <value>Expression...</value>
+ </data>
<data name="HeigthText.Location" type="System.Drawing.Point, System.Drawing">
<value>128, 144</value>
</data>
@@ -198,6 +204,9 @@
<data name="WidthText.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
+ <data name="WidthText.Items" xml:space="preserve">
+ <value>Expression...</value>
+ </data>
<data name="WidthText.Location" type="System.Drawing.Point, System.Drawing">
<value>128, 112</value>
</data>
@@ -291,11 +300,14 @@
<data name=">>Symbol.ZOrder" xml:space="preserve">
<value>6</value>
</data>
+ <data name="label5.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
<data name="label5.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 152</value>
</data>
<data name="label5.Size" type="System.Drawing.Size, System.Drawing">
- <value>96, 16</value>
+ <value>38, 13</value>
</data>
<data name="label5.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
@@ -315,11 +327,14 @@
<data name=">>label5.ZOrder" xml:space="preserve">
<value>7</value>
</data>
+ <data name="label4.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
<data name="label4.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 120</value>
</data>
<data name="label4.Size" type="System.Drawing.Size, System.Drawing">
- <value>96, 16</value>
+ <value>35, 13</value>
</data>
<data name="label4.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@@ -339,11 +354,14 @@
<data name=">>label4.ZOrder" xml:space="preserve">
<value>8</value>
</data>
+ <data name="label3.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
<data name="label3.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 88</value>
</data>
<data name="label3.Size" type="System.Drawing.Size, System.Drawing">
- <value>88, 16</value>
+ <value>52, 13</value>
</data>
<data name="label3.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@@ -363,11 +381,14 @@
<data name=">>label3.ZOrder" xml:space="preserve">
<value>9</value>
</data>
+ <data name="label2.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
<data name="label2.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 56</value>
</data>
<data name="label2.Size" type="System.Drawing.Size, System.Drawing">
- <value>72, 16</value>
+ <value>65, 13</value>
</data>
<data name="label2.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -387,11 +408,14 @@
<data name=">>label2.ZOrder" xml:space="preserve">
<value>10</value>
</data>
+ <data name="label1.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 24</value>
</data>
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
- <value>72, 16</value>
+ <value>41, 13</value>
</data>
<data name="label1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -454,7 +478,7 @@
<value>fillStyleEditor</value>
</data>
<data name=">>fillStyleEditor.Type" xml:space="preserve">
- <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.FillStyleEditor, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4358, Culture=neutral, PublicKeyToken=null</value>
+ <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.FillStyleEditor, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4437, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>fillStyleEditor.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -505,7 +529,7 @@
<value>lineStyleEditor</value>
</data>
<data name=">>lineStyleEditor.Type" xml:space="preserve">
- <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.LineStyleEditor, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4358, Culture=neutral, PublicKeyToken=null</value>
+ <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.LineStyleEditor, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4437, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>lineStyleEditor.Parent" xml:space="preserve">
<value>groupBox3</value>
@@ -667,7 +691,7 @@
<value>colorFontForeground</value>
</data>
<data name=">>colorFontForeground.Type" xml:space="preserve">
- <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboWithTransparency, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4358, Culture=neutral, PublicKeyToken=null</value>
+ <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboWithTransparency, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4437, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>colorFontForeground.Parent" xml:space="preserve">
<value>groupBoxFont</value>
@@ -813,11 +837,14 @@
<data name=">>panel1.ZOrder" xml:space="preserve">
<value>2</value>
</data>
+ <data name="lblForeground.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
<data name="lblForeground.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 56</value>
</data>
<data name="lblForeground.Size" type="System.Drawing.Size, System.Drawing">
- <value>40, 16</value>
+ <value>31, 13</value>
</data>
<data name="lblForeground.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
@@ -888,11 +915,14 @@
<data name=">>fontCombo.ZOrder" xml:space="preserve">
<value>5</value>
</data>
+ <data name="label10.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
<data name="label10.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 32</value>
</data>
<data name="label10.Size" type="System.Drawing.Size, System.Drawing">
- <value>40, 16</value>
+ <value>28, 13</value>
</data>
<data name="label10.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
@@ -1056,11 +1086,14 @@
<data name=">>label7.ZOrder" xml:space="preserve">
<value>4</value>
</data>
+ <data name="label6.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
<data name="label6.Location" type="System.Drawing.Point, System.Drawing">
<value>12, 40</value>
</data>
<data name="label6.Size" type="System.Drawing.Size, System.Drawing">
- <value>104, 16</value>
+ <value>83, 13</value>
</data>
<data name="label6.TabIndex" type="System.Int32, mscorlib">
<value>20</value>
Added: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/Strings/FontStyleEditor.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/Strings/FontStyleEditor.Designer.cs (rev 0)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/Strings/FontStyleEditor.Designer.cs 2009-12-24 11:02:34 UTC (rev 4471)
@@ -0,0 +1,73 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Runtime Version:2.0.50727.4927
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.Strings {
+ using System;
+
+
+ /// <summary>
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ /// </summary>
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ internal class FontStyleEditor {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal FontStyleEditor() {
+ }
+
+ /// <summary>
+ /// Returns the cached ResourceManager instance used by this class.
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.Strings.FontStyleEdit" +
+ "or", typeof(FontStyleEditor).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ /// <summary>
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Expression....
+ /// </summary>
+ internal static string ExpressionItem {
+ get {
+ return ResourceManager.GetString("ExpressionItem", resourceCulture);
+ }
+ }
+ }
+}
Added: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/Strings/FontStyleEditor.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/Strings/FontStyleEditor.resx (rev 0)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/Strings/FontStyleEditor.resx 2009-12-24 11:02:34 UTC (rev 4471)
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <data name="ExpressionItem" xml:space="preserve">
+ <value>Expression...</value>
+ <comment>A value displayed in the combobox to activate the expression builder</comment>
+ </data>
+</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/LayerEditorControls/ScaleControls/ItemStyle.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/LayerEditorControls/ScaleControls/ItemStyle.cs 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/LayerEditorControls/ScaleControls/ItemStyle.cs 2009-12-24 11:02:34 UTC (rev 4471)
@@ -123,24 +123,22 @@
UserControl uc = null;
if (isLabel)
{
- uc = new GeometryStyleEditors.FontStyleEditor();
+ uc = new GeometryStyleEditors.FontStyleEditor(m_owner.Editor, m_owner.Schema, m_owner.FeatureSourceId);
((GeometryStyleEditors.FontStyleEditor)uc).Item = (TextSymbolType)Utility.DeepCopy(m_label);
-
- ((GeometryStyleEditors.FontStyleEditor)uc).SetAvalibleColumns(m_owner.GetAvalibleColumns());
}
else if (isPoint)
{
- uc = new GeometryStyleEditors.PointFeatureStyleEditor();
+ uc = new GeometryStyleEditors.PointFeatureStyleEditor(m_owner.Editor, m_owner.Schema, m_owner.FeatureSourceId);
((GeometryStyleEditors.PointFeatureStyleEditor)uc).Item = (PointSymbolization2DType)Utility.XmlDeepCopy(m_point);
}
else if (isLine)
{
- uc = new GeometryStyleEditors.LineFeatureStyleEditor();
+ uc = new GeometryStyleEditors.LineFeatureStyleEditor(m_owner.Editor, m_owner.Schema, m_owner.FeatureSourceId);
((GeometryStyleEditors.LineFeatureStyleEditor)uc).Item = (StrokeTypeCollection)Utility.XmlDeepCopy(m_line);
}
else if (isArea)
{
- uc = new GeometryStyleEditors.AreaFeatureStyleEditor();
+ uc = new GeometryStyleEditors.AreaFeatureStyleEditor(m_owner.Editor, m_owner.Schema, m_owner.FeatureSourceId);
((GeometryStyleEditors.AreaFeatureStyleEditor)uc).Item = (AreaSymbolizationFillType)Utility.XmlDeepCopy(m_area);
}
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/LayerEditorControls/VectorLayer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/LayerEditorControls/VectorLayer.cs 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/LayerEditorControls/VectorLayer.cs 2009-12-24 11:02:34 UTC (rev 4471)
@@ -1099,6 +1099,11 @@
m_editor.HasChanged();
}
+ public string FeatureSourceId
+ {
+ get { return m_layer.Item.ResourceId; }
+ }
+
/// <summary>
/// Sort helper used to sort the scale ranges
/// </summary>
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/Properties/Resources.Designer.cs 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/Properties/Resources.Designer.cs 2009-12-24 11:02:34 UTC (rev 4471)
@@ -62,6 +62,13 @@
/// <summary>
/// Looks up a localized string similar to <?xml version="1.0" encoding="utf-8" ?>
+ ///
+ ///<!--
+ /// Note to translators:
+ /// You can only translate <Label>, <ToolTip> and <Description>
+ /// If you translate any of the others, the editor won't work!
+ ///-->
+ ///
///<CommandTypesDataset>
/// <Command>
/// <Command>About</Command>
@@ -72,15 +79,7 @@
/// <Viewers>All</Viewers>
/// <Type>Built-In</Type>
/// <EnabledIcon></EnabledIcon>
- /// <DisabledIcon></DisabledIcon>
- /// </Command>
- ///
- /// <Command>
- /// <Command>Buffer</Command>
- /// <Label>Buffer</Label>
- /// <ToolTip>Buffer</ToolTip>
- /// <Action>Buffer</Action>
- /// < [rest of string was truncated]";.
+ /// <D [rest of string was truncated]";.
/// </summary>
internal static string CommandTypesDataset {
get {
@@ -89,39 +88,6 @@
}
/// <summary>
- /// Looks up a localized string similar to <?xml version="1.0" encoding="utf-8" ?>
- ///<ComboBoxDataSet>
- ///
- /// <Font>
- /// <Display>Arial</Display>
- /// <Value>Arial</Value>
- /// </Font>
- /// <Font>
- /// <Display>Arial Black</Display>
- /// <Value>Arial Black</Value>
- /// </Font>
- /// <Font>
- /// <Display>Arial Narrow</Display>
- /// <Value>Arial Narrow</Value>
- /// </Font>
- /// <Font>
- /// <Display>BankGothic Lt BT</Display>
- /// <Value>ankGothic Lt BT</Value>
- /// </Font>
- /// <Font>
- /// <Display>BankGothic Md BT</Display>
- /// <Value>BankGothic Md BT</Value>
- /// </Font>
- /// <Font>
- /// <Display>Book [rest of string was truncated]";.
- /// </summary>
- internal static string FontStyleComboDataset {
- get {
- return ResourceManager.GetString("FontStyleComboDataset", resourceCulture);
- }
- }
-
- /// <summary>
/// Looks up a localized string similar to <?xml version="1.0" standalone="yes"?>
///<ComboBoxDataSet>
/// <SymbolMark>
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/Properties/Resources.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/Properties/Resources.resx 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/Properties/Resources.resx 2009-12-24 11:02:34 UTC (rev 4471)
@@ -121,9 +121,6 @@
<data name="CommandTypesDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\CommandTypesDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
- <data name="FontStyleComboDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\FontStyleComboDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
- </data>
<data name="GeometryStyleComboDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\GeometryStyleComboDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/ResourceEditors.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/ResourceEditors.csproj 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/ResourceEditors.csproj 2009-12-24 11:02:34 UTC (rev 4471)
@@ -405,6 +405,11 @@
<DesignTime>True</DesignTime>
<DependentUpon>ColorComboBox.resx</DependentUpon>
</Compile>
+ <Compile Include="GeometryStyleEditors\Strings\FontStyleEditor.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>FontStyleEditor.resx</DependentUpon>
+ </Compile>
<Compile Include="GeometryStyleEditors\Strings\PointFeatureStyleEditor.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
@@ -1138,6 +1143,10 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>ColorComboBox.Designer.cs</LastGenOutput>
</EmbeddedResource>
+ <EmbeddedResource Include="GeometryStyleEditors\Strings\FontStyleEditor.resx">
+ <Generator>ResXFileCodeGenerator</Generator>
+ <LastGenOutput>FontStyleEditor.Designer.cs</LastGenOutput>
+ </EmbeddedResource>
<EmbeddedResource Include="GeometryStyleEditors\Strings\PointFeatureStyleEditor.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>PointFeatureStyleEditor.Designer.cs</LastGenOutput>
@@ -1244,9 +1253,6 @@
<None Include="Resources\CommandTypesDataset.xml" />
</ItemGroup>
<ItemGroup>
- <None Include="Resources\FontStyleComboDataset.xml" />
- </ItemGroup>
- <ItemGroup>
<None Include="Resources\GeometryStyleComboDataset.xml" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
Deleted: trunk/Tools/Maestro/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/Resources/FontStyleComboDataset.xml 2009-12-24 11:02:34 UTC (rev 4471)
@@ -1,594 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ComboBoxDataSet>
-
- <Font>
- <Display>Arial</Display>
- <Value>Arial</Value>
- </Font>
- <Font>
- <Display>Arial Black</Display>
- <Value>Arial Black</Value>
- </Font>
- <Font>
- <Display>Arial Narrow</Display>
- <Value>Arial Narrow</Value>
- </Font>
- <Font>
- <Display>BankGothic Lt BT</Display>
- <Value>ankGothic Lt BT</Value>
- </Font>
- <Font>
- <Display>BankGothic Md BT</Display>
- <Value>BankGothic Md BT</Value>
- </Font>
- <Font>
- <Display>Book Antiqua</Display>
- <Value>Book Antiqua</Value>
- </Font>
- <Font>
- <Display>Bookman Old Style</Display>
- <Value>Bookman Old Style</Value>
- </Font>
- <Font>
- <Display>Century Gothic</Display>
- <Value>Century Gothic</Value>
- </Font>
- <Font>
- <Display>CityBlueprint</Display>
- <Value>CityBlueprint</Value>
- </Font>
- <Font>
- <Display>Comic Sans MS</Display>
- <Value>Comic Sans MS</Value>
- </Font>
- <Font>
- <Display>CommercialPi BT</Display>
- <Value>CommercialPi BT</Value>
- </Font>
- <Font>
- <Display>CommercialScript BT</Display>
- <Value>CommercialScript BT</Value>
- </Font>
- <Font>
- <Display>Complex</Display>
- <Value>Complex</Value>
- </Font>
- <Font>
- <Display>CountryBlueprint</Display>
- <Value>CountryBlueprint</Value>
- </Font>
- <Font>
- <Display>Courier New</Display>
- <Value>Courier New</Value>
- </Font>
- <Font>
- <Display>Dutch801 Rm BT</Display>
- <Value>Dutch801 Rm BT</Value>
- </Font>
- <Font>
- <Display>Dutch801 XBd BT</Display>
- <Value>Dutch801 XBd BT</Value>
- </Font>
- <Font>
- <Display>Estrangelo Edessa</Display>
- <Value>Estrangelo Edessa</Value>
- </Font>
- <Font>
- <Display>EuroRoman</Display>
- <Value>EuroRoman</Value>
- </Font>
- <Font>
- <Display>Franklin Gothic Medium</Display>
- <Value>Franklin Gothic Medium</Value>
- </Font>
- <Font>
- <Display>Garamond</Display>
- <Value>Garamond</Value>
- </Font>
- <Font>
- <Display>Gautami</Display>
- <Value>Gautami</Value>
- </Font>
- <Font>
- <Display>GDT</Display>
- <Value>GDT</Value>
- </Font>
- <Font>
- <Display>Georgia</Display>
- <Value>Georgia</Value>
- </Font>
- <Font>
- <Display>GothicE</Display>
- <Value>GothicE</Value>
- </Font>
- <Font>
- <Display>GothicG</Display>
- <Value>GothicG</Value>
- </Font>
- <Font>
- <Display>Gothicl</Display>
- <Value>Gothicl</Value>
- </Font>
- <Font>
- <Display>GreekC</Display>
- <Value>GreekC</Value>
- </Font>
- <Font>
- <Display>GreekS</Display>
- <Value>GreekS</Value>
- </Font>
- <Font>
- <Display>Haettenschweiler</Display>
- <Value>Haettenschweiler</Value>
- </Font>
- <Font>
- <Display>Impact</Display>
- <Value>Impact</Value>
- </Font>
- <Font>
- <Display>ISOCP</Display>
- <Value>ISOCP</Value>
- </Font>
- <Font>
- <Display>ISOCP2</Display>
- <Value>ISOCP2</Value>
- </Font>
- <Font>
- <Display>ISOCP3</Display>
- <Value>ISOCP3</Value>
- </Font>
- <Font>
- <Display>ISOCPEUR</Display>
- <Value>Arial</Value>
- </Font>
- <Font>
- <Display>ISOCT</Display>
- <Value>ISOCT</Value>
- </Font>
- <Font>
- <Display>ISOCT2</Display>
- <Value>ISOCT2</Value>
- </Font>
- <Font>
- <Display>ISOCT3</Display>
- <Value>ISOCT3</Value>
- </Font>
- <Font>
- <Display>ISOCTEUR</Display>
- <Value>ISOCTEUR</Value>
- </Font>
- <Font>
- <Display>Italic</Display>
- <Value>Italic</Value>
- </Font>
- <Font>
- <Display>ItalicC</Display>
- <Value>ItalicC</Value>
- </Font>
- <Font>
- <Display>ItalicT</Display>
- <Value>ItalicT</Value>
- </Font>
- <Font>
- <Display>Kartika</Display>
- <Value>Kartika</Value>
- </Font>
- <Font>
- <Display>Latha</Display>
- <Value>Latha</Value>
- </Font>
- <Font>
- <Display>Lucida Console</Display>
- <Value>Lucida Console</Value>
- </Font>
- <Font>
- <Display>Lucida Sans Unicode</Display>
- <Value>Lucida Sans Unicode</Value>
- </Font>
- <Font>
- <Display>Mangal</Display>
- <Value>Mangal</Value>
- </Font>
- <Font>
- <Display>Map Symbols</Display>
- <Value>Map Symbols</Value>
- </Font>
- <Font>
- <Display>MapInfo Arrows</Display>
- <Value>MapInfo Arrows</Value>
- </Font>
- <Font>
- <Display>MapInfo Cartographic</Display>
- <Value>MapInfo Cartographic</Value>
- </Font>
- <Font>
- <Display>MapInfo Dispersed Groups</Display>
- <Value>MapInfo Dispersed Groups</Value>
- </Font>
- <Font>
- <Display>MapInfo Miscellaneous</Display>
- <Value>MapInfo Miscellaneous</Value>
- </Font>
- <Font>
- <Display>MapInfo Oil&Gas</Display>
- <Value>MapInfo Oil&Gas</Value>
- </Font>
- <Font>
- <Display>MapInfo Real Estate</Display>
- <Value>MapInfo Real Estate</Value>
- </Font>
- <Font>
- <Display>MapInfo Shields</Display>
- <Value>MapInfo Shields</Value>
- </Font>
- <Font>
- <Display>MapInfo Symbols</Display>
- <Value>MapInfo Symbols</Value>
- </Font>
- <Font>
- <Display>MapInfo Transportation</Display>
- <Value>MapInfo Transportation</Value>
- </Font>
- <Font>
- <Display>MapInfo Weather</Display>
- <Value>MapInfo Weather</Value>
- </Font>
- <Font>
- <Display>Marlett</Display>
- <Value>Marlett</Value>
- </Font>
- <Font>
- <Display>Microsoft Sans Serif</Display>
- <Value>Microsoft Sans Serif</Value>
- </Font>
- <Font>
- <Display>Monospac821 BT</Display>
- <Value>Monospac821 BT</Value>
- </Font>
- <Font>
- <Display>Monotxt</Display>
- <Value>Monotxt</Value>
- </Font>
- <Font>
- <Display>MV Boli</Display>
- <Value>MV Boli</Value>
- </Font>
- <Font>
- <Display>Nina</Display>
- <Value>Nina</Value>
- </Font>
- <Font>
- <Display>Palatino Linotype</Display>
- <Value>Palatino Linotype</Value>
- </Font>
- <Font>
- <Display>PanRoman</Display>
- <Value>PanRoman</Value>
- </Font>
- <Font>
- <Display>Proxy 1</Display>
- <Value>Proxy 1</Value>
- </Font>
- <Font>
- <Display>Proxy 2</Display>
- <Value>Proxy 2</Value>
- </Font>
- <Font>
- <Display>Proxy 3</Display>
- <Value>Proxy 3</Value>
- </Font>
- <Font>
- <Display>Proxy 4</Display>
- <Value>Proxy 4</Value>
- </Font>
- <Font>
- <Display>Proxy 5</Display>
- <Value>Proxy 5</Value>
- </Font>
- <Font>
- <Display>Proxy 6</Display>
- <Value>Proxy 6</Value>
- </Font>
- <Font>
- <Display>Proxy 7</Display>
- <Value>Proxy 7</Value>
- </Font>
- <Font>
- <Display>Proxy 8</Display>
- <Value>Proxy 8</Value>
- </Font>
- <Font>
- <Display>Proxy 9</Display>
- <Value>Proxy 9</Value>
- </Font>
- <Font>
- <Display>Raavi</Display>
- <Value>Raavi</Value>
- </Font>
- <Font>
- <Display>RomanC</Display>
- <Value>RomanC</Value>
- </Font>
- <Font>
- <Display>RomanD</Display>
- <Value>RomanD</Value>
- </Font>
- <Font>
- <Display>RomanS</Display>
- <Value>RomanS</Value>
- </Font>
- <Font>
- <Display>RomanT</Display>
- <Value>RomanT</Value>
- </Font>
- <Font>
- <Display>Romantic</Display>
- <Value>Romantic</Value>
- </Font>
- <Font>
- <Display>SansSerif</Display>
- <Value>SansSerif</Value>
- </Font>
- <Font>
- <Display>ScriptC</Display>
- <Value>ScriptC</Value>
- </Font>
- <Font>
- <Display>ScriptS</Display>
- <Value>ScriptS</Value>
- </Font>
- <Font>
- <Display>Shruti</Display>
- <Value>Shruti</Value>
- </Font>
- <Font>
- <Display>Simplex</Display>
- <Value>Simplex</Value>
- </Font>
- <Font>
- <Display>Stylus BT</Display>
- <Value>Stylus BT</Value>
- </Font>
- <Font>
- <Display>SuperFrench</Display>
- <Value>SuperFrench</Value>
- </Font>
- <Font>
- <Display>Swis721 BdCnOul BT</Display>
- <Value>Swis721 BdCnOul BT</Value>
- </Font>
- <Font>
- <Display>Swis721 BdOul BT</Display>
- <Value>Swis721 BdOul BT</Value>
- </Font>
- <Font>
- <Display>Swis721 Blk BT</Display>
- <Value>Swis721 Blk BT</Value>
- </Font>
- <Font>
- <Display>Swis721 BlkCn BT</Display>
- <Value>Swis721 BlkCn BT</Value>
- </Font>
- <Font>
- <Display>Swis721 BlkEx BT</Display>
- <Value>Swis721 BlkEx BT</Value>
- </Font>
- <Font>
- <Display>Swis721 BlkOul BT</Display>
- <Value>Swis721 BlkOul BT</Value>
- </Font>
- <Font>
- <Display>Swis721 BT</Display>
- <Value>Swis721 BT</Value>
- </Font>
- <Font>
- <Display>Swis721 Cn BT</Display>
- <Value>Swis721 Cn BT</Value>
- </Font>
- <Font>
- <Display>Swis721 Ex BT</Display>
- <Value>Swis721 Ex BT</Value>
- </Font>
- <Font>
- <Display>Swis721 Lt BT</Display>
- <Value>Swis721 Lt BT</Value>
- </Font>
- <Font>
- <Display>Swis721 LtCn BT</Display>
- <Value>Swis721 LtCn BT</Value>
- </Font>
- <Font>
- <Display>Swis721 LtEx BT</Display>
- <Value>Swis721 LtEx BT</Value>
- </Font>
- <Font>
- <Display>Syastro</Display>
- <Value>Syastro</Value>
- </Font>
- <Font>
- <Display>Sylfaen</Display>
- <Value>Sylfaen</Value>
- </Font>
- <Font>
- <Display>Symap</Display>
- <Value>Symap</Value>
- </Font>
- <Font>
- <Display>Symath</Display>
- <Value>Symath</Value>
- </Font>
- <Font>
- <Display>Symbol</Display>
- <Value>Symbol</Value>
- </Font>
- <Font>
- <Display>Symeteo</Display>
- <Value>Symeteo</Value>
- </Font>
- <Font>
- <Display>Symusic</Display>
- <Value>Symusic</Value>
- </Font>
- <Font>
- <Display>Tahoma</Display>
- <Value>Tahoma</Value>
- </Font>
- <Font>
- <Display>Technic</Display>
- <Value>Technic</Value>
- </Font>
- <Font>
- <Display>TechnicBold</Display>
- <Value>TechnicBold</Value>
- </Font>
- <Font>
- <Display>TechnicLite</Display>
- <Value>TechnicLite</Value>
- </Font>
- <Font>
- <Display>Times New Roman</Display>
- <Value>Times New Roman</Value>
- </Font>
- <Font>
- <Display>Trebuchet MS</Display>
- <Value>Trebuchet MS</Value>
- </Font>
- <Font>
- <Display>Tunga</Display>
- <Value>Tunga</Value>
- </Font>
- <Font>
- <Display>Txt</Display>
- <Value>Txt</Value>
- </Font>
- <Font>
- <Display>UniversalMath1 BT</Display>
- <Value>UniversalMath1 BT</Value>
- </Font>
- <Font>
- <Display>Verdana</Display>
- <Value>Verdana</Value>
- </Font>
- <Font>
- <Display>Vineta BT</Display>
- <Value>Vineta BT</Value>
- </Font>
- <Font>
- <Display>Vrinda</Display>
- <Value>Vrinda</Value>
- </Font>
- <Font>
- <Display>Webdings</Display>
- <Value>Webdings</Value>
- </Font>
- <Font>
- <Display>Windings</Display>
- <Value>Windings</Value>
- </Font>
- <Font>
- <Display>Windings 2</Display>
- <Value>Windings 2</Value>
- </Font>
- <Font>
- <Display>Windings 3</Display>
- <Value>Windings 3</Value>
- </Font>
-
- <BackgroundType>
- <Display>Ghosted</Display>
- <Value>Ghosted</Value>
- </BackgroundType>
- <BackgroundType>
- <Display>Opaque</Display>
- <Value>Opaque</Value>
- </BackgroundType>
- <BackgroundType>
- <Display>Transparent</Display>
- <Value>Transparent</Value>
- </BackgroundType>
-
- <Vertical>
- <Display>Baseline</Display>
- <Value>'Baseline'</Value>
- </Vertical>
- <Vertical>
- <Display>Bottom</Display>
- <Value>'Bottom'</Value>
- </Vertical>
- <Vertical>
- <Display>Capline</Display>
- <Value>'Capline'</Value>
- </Vertical>
- <Vertical>
- <Display>Halfline</Display>
- <Value>'Halfline'</Value>
- </Vertical>
- <Vertical>
- <Display>Top</Display>
- <Value>'Top'</Value>
- </Vertical>
-
- <Horizontal>
- <Display>Center</Display>
- <Value>'Center'</Value>
- </Horizontal>
-
- <SizeContext>
- <Display>Device space</Display>
- <Value>DeviceUnits</Value>
- </SizeContext>
- <SizeContext>
- <Display>Map space</Display>
- <Value>MappingUnits</Value>
- </SizeContext>
-
- <Units>
- <Display>Points</Display>
- <Value>Points</Value>
- </Units>
- <Units>
- <Display>Inches</Display>
- <Value>Inches</Value>
- </Units>
- <Units>
- <Display>Feet</Display>
- <Value>Feet</Value>
- </Units>
- <Units>
- <Display>Yards</Display>
- <Value>Yards</Value>
- </Units>
- <Units>
- <Display>Millimeters</Display>
- <Value>Millimeters</Value>
- </Units>
- <Units>
- <Display>Centimeters</Display>
- <Value>Centimeters</Value>
- </Units>
- <Units>
- <Display>Meters</Display>
- <Value>Meters</Value>
- </Units>
- <Units>
- <Display>Kilometers</Display>
- <Value>Kilometers</Value>
- </Units>
-
- <Rotation>
- <Display>0 degrees</Display>
- <Value>0</Value>
- </Rotation>
- <Rotation>
- <Display>30 degrees</Display>
- <Value>30</Value>
- </Rotation>
- <Rotation>
- <Display>45 degrees</Display>
- <Value>45</Value>
- </Rotation>
- <Rotation>
- <Display>90 degrees</Display>
- <Value>90</Value>
- </Rotation>
-</ComboBoxDataSet>
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/Resources/GeometryStyleComboDataset.xml 2009-12-24 11:02:34 UTC (rev 4471)
@@ -91,4 +91,56 @@
<Display>90 degrees</Display>
<Value>90</Value>
</Rotation>
+ <Rotation>
+ <Display>Expression...</Display>
+ <Value>Expression...</Value>
+ </Rotation>
+
+ <BackgroundType>
+ <Display>Ghosted</Display>
+ <Value>Ghosted</Value>
+ </BackgroundType>
+ <BackgroundType>
+ <Display>Opaque</Display>
+ <Value>Opaque</Value>
+ </BackgroundType>
+ <BackgroundType>
+ <Display>Transparent</Display>
+ <Value>Transparent</Value>
+ </BackgroundType>
+
+ <Vertical>
+ <Display>Baseline</Display>
+ <Value>'Baseline'</Value>
+ </Vertical>
+ <Vertical>
+ <Display>Bottom</Display>
+ <Value>'Bottom'</Value>
+ </Vertical>
+ <Vertical>
+ <Display>Capline</Display>
+ <Value>'Capline'</Value>
+ </Vertical>
+ <Vertical>
+ <Display>Halfline</Display>
+ <Value>'Halfline'</Value>
+ </Vertical>
+ <Vertical>
+ <Display>Top</Display>
+ <Value>'Top'</Value>
+ </Vertical>
+ <Vertical>
+ <Display>Expression...</Display>
+ <Value>Expression...</Value>
+ </Vertical>
+
+ <Horizontal>
+ <Display>Center</Display>
+ <Value>'Center'</Value>
+ </Horizontal>
+ <Horizontal>
+ <Display>Expression...</Display>
+ <Value>Expression...</Value>
+ </Horizontal>
+
</ComboBoxDataSet>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/ThemeCreator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/ThemeCreator.cs 2009-12-23 22:51:43 UTC (rev 4470)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/ThemeCreator.cs 2009-12-24 11:02:34 UTC (rev 4471)
@@ -815,19 +815,19 @@
UserControl uc = null;
if (m_ruleCollection is MaestroAPI.PointTypeStyleType)
{
- uc = new GeometryStyleEditors.PointFeatureStyleEditor();
+ uc = new GeometryStyleEditors.PointFeatureStyleEditor(m_editor, m_schema, m_layer.Item.ResourceId);
((GeometryStyleEditors.PointFeatureStyleEditor)uc).Item = (MaestroAPI.PointSymbolization2DType)MaestroAPI.Utility.XmlDeepCopy(m_defaultItem);
((GeometryStyleEditors.PointFeatureStyleEditor)uc).SetupForTheming();
}
else if (m_ruleCollection is MaestroAPI.LineTypeStyleType)
{
- uc = new GeometryStyleEditors.LineFeatureStyleEditor();
+ uc = new GeometryStyleEditors.LineFeatureStyleEditor(m_editor, m_schema, m_layer.Item.ResourceId);
((GeometryStyleEditors.LineFeatureStyleEditor)uc).Item = (MaestroAPI.StrokeTypeCollection)MaestroAPI.Utility.XmlDeepCopy(m_defaultItem);
((GeometryStyleEditors.LineFeatureStyleEditor)uc).SetupForTheming();
}
else if (m_ruleCollection is MaestroAPI.AreaTypeStyleType)
{
- uc = new GeometryStyleEditors.AreaFeatureStyleEditor();
+ uc = new GeometryStyleEditors.AreaFeatureStyleEditor(m_editor, m_schema, m_layer.Item.ResourceId);
((GeometryStyleEditors.AreaFeatureStyleEditor)uc).Item = (MaestroAPI.AreaSymbolizationFillType)MaestroAPI.Utility.XmlDeepCopy(m_defaultItem);
((GeometryStyleEditors.AreaFeatureStyleEditor)uc).SetupForTheming();
}
More information about the mapguide-commits
mailing list