[mapguide-commits] r6393 -
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sat Dec 31 08:48:10 EST 2011
Author: jng
Date: 2011-12-31 05:48:10 -0800 (Sat, 31 Dec 2011)
New Revision: 6393
Modified:
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineFeatureStyleEditor.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineFeatureStyleEditor.resx
Log:
#1906: Fix composite line style editor, not properly handling size contexts. Also indicate to the user, the order in which the composite lines are drawn in.
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineFeatureStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineFeatureStyleEditor.cs 2011-12-31 13:28:00 UTC (rev 6392)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineFeatureStyleEditor.cs 2011-12-31 13:48:10 UTC (rev 6393)
@@ -181,6 +181,13 @@
}
lineStyleEditor.thicknessCombo.Text = st.Thickness;
+
+ sizeContextCombo.Enabled = true;
+ var st2 = st as IStroke2;
+ if (st2 != null)
+ sizeContextCombo.SelectedValue = st2.SizeContext;
+ else
+ sizeContextCombo.Enabled = false;
}
previewPicture.Refresh();
}
@@ -352,6 +359,7 @@
//
// lineStyleEditor
//
+ this.lineStyleEditor.ColorExpression = "";
resources.ApplyResources(this.lineStyleEditor, "lineStyleEditor");
this.lineStyleEditor.Name = "lineStyleEditor";
this.lineStyleEditor.RequiresExpressionEditor += new System.EventHandler(this.lineStyleEditor_RequiresExpressionEditor);
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineFeatureStyleEditor.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineFeatureStyleEditor.resx 2011-12-31 13:28:00 UTC (rev 6392)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineFeatureStyleEditor.resx 2011-12-31 13:48:10 UTC (rev 6393)
@@ -175,7 +175,7 @@
<value>0</value>
</data>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>3, 16</value>
+ <value>17, 17</value>
</metadata>
<data name="AddStyleButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -280,7 +280,7 @@
<value>2</value>
</data>
<data name="CompositeGroup.Text" xml:space="preserve">
- <value>Composite line</value>
+ <value>Composite line (lines are drawn top to bottom)</value>
</data>
<data name=">>CompositeGroup.Name" xml:space="preserve">
<value>CompositeGroup</value>
@@ -342,23 +342,59 @@
<data name=">>compositePanel.ZOrder" xml:space="preserve">
<value>2</value>
</data>
- <data name="lineStyleEditor.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Fill</value>
+ <data name=">>lineGroup.Name" xml:space="preserve">
+ <value>lineGroup</value>
</data>
- <data name="lineStyleEditor.Location" type="System.Drawing.Point, System.Drawing">
- <value>3, 16</value>
+ <data name=">>lineGroup.Type" xml:space="preserve">
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="lineStyleEditor.Size" type="System.Drawing.Size, System.Drawing">
- <value>291, 133</value>
+ <data name=">>lineGroup.Parent" xml:space="preserve">
+ <value>propertyPanel</value>
</data>
- <data name="lineStyleEditor.TabIndex" type="System.Int32, mscorlib">
+ <data name=">>lineGroup.ZOrder" xml:space="preserve">
<value>0</value>
</data>
+ <data name=">>sizeGroup.Name" xml:space="preserve">
+ <value>sizeGroup</value>
+ </data>
+ <data name=">>sizeGroup.Type" xml:space="preserve">
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>sizeGroup.Parent" xml:space="preserve">
+ <value>propertyPanel</value>
+ </data>
+ <data name=">>sizeGroup.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="propertyPanel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Top</value>
+ </data>
+ <data name="propertyPanel.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 208</value>
+ </data>
+ <data name="propertyPanel.Size" type="System.Drawing.Size, System.Drawing">
+ <value>297, 232</value>
+ </data>
+ <data name="propertyPanel.TabIndex" type="System.Int32, mscorlib">
+ <value>5</value>
+ </data>
+ <data name=">>propertyPanel.Name" xml:space="preserve">
+ <value>propertyPanel</value>
+ </data>
+ <data name=">>propertyPanel.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>propertyPanel.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>propertyPanel.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
<data name=">>lineStyleEditor.Name" xml:space="preserve">
<value>lineStyleEditor</value>
</data>
<data name=">>lineStyleEditor.Type" xml:space="preserve">
- <value>Maestro.Editors.LayerDefinition.Vector.StyleEditors.LineStyleEditor, Maestro.Editors, Version=4.0.0.6128, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.LayerDefinition.Vector.StyleEditors.LineStyleEditor, Maestro.Editors, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>lineStyleEditor.Parent" xml:space="preserve">
<value>lineGroup</value>
@@ -393,6 +429,105 @@
<data name=">>lineGroup.ZOrder" xml:space="preserve">
<value>0</value>
</data>
+ <data name="lineStyleEditor.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Fill</value>
+ </data>
+ <data name="lineStyleEditor.Location" type="System.Drawing.Point, System.Drawing">
+ <value>3, 16</value>
+ </data>
+ <data name="lineStyleEditor.Size" type="System.Drawing.Size, System.Drawing">
+ <value>291, 133</value>
+ </data>
+ <data name="lineStyleEditor.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name=">>lineStyleEditor.Name" xml:space="preserve">
+ <value>lineStyleEditor</value>
+ </data>
+ <data name=">>lineStyleEditor.Type" xml:space="preserve">
+ <value>Maestro.Editors.LayerDefinition.Vector.StyleEditors.LineStyleEditor, Maestro.Editors, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ </data>
+ <data name=">>lineStyleEditor.Parent" xml:space="preserve">
+ <value>lineGroup</value>
+ </data>
+ <data name=">>lineStyleEditor.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name=">>sizeUnitsCombo.Name" xml:space="preserve">
+ <value>sizeUnitsCombo</value>
+ </data>
+ <data name=">>sizeUnitsCombo.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=">>sizeUnitsCombo.Parent" xml:space="preserve">
+ <value>sizeGroup</value>
+ </data>
+ <data name=">>sizeUnitsCombo.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name=">>sizeContextCombo.Name" xml:space="preserve">
+ <value>sizeContextCombo</value>
+ </data>
+ <data name=">>sizeContextCombo.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=">>sizeContextCombo.Parent" xml:space="preserve">
+ <value>sizeGroup</value>
+ </data>
+ <data name=">>sizeContextCombo.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name=">>label3.Name" xml:space="preserve">
+ <value>label3</value>
+ </data>
+ <data name=">>label3.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label3.Parent" xml:space="preserve">
+ <value>sizeGroup</value>
+ </data>
+ <data name=">>label3.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
+ <data name=">>label2.Name" xml:space="preserve">
+ <value>label2</value>
+ </data>
+ <data name=">>label2.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label2.Parent" xml:space="preserve">
+ <value>sizeGroup</value>
+ </data>
+ <data name=">>label2.ZOrder" xml:space="preserve">
+ <value>3</value>
+ </data>
+ <data name="sizeGroup.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Top</value>
+ </data>
+ <data name="sizeGroup.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 0</value>
+ </data>
+ <data name="sizeGroup.Size" type="System.Drawing.Size, System.Drawing">
+ <value>297, 80</value>
+ </data>
+ <data name="sizeGroup.TabIndex" type="System.Int32, mscorlib">
+ <value>1</value>
+ </data>
+ <data name="sizeGroup.Text" xml:space="preserve">
+ <value>Size</value>
+ </data>
+ <data name=">>sizeGroup.Name" xml:space="preserve">
+ <value>sizeGroup</value>
+ </data>
+ <data name=">>sizeGroup.Type" xml:space="preserve">
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>sizeGroup.Parent" xml:space="preserve">
+ <value>propertyPanel</value>
+ </data>
+ <data name=">>sizeGroup.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
<data name="sizeUnitsCombo.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
@@ -495,69 +630,6 @@
<data name=">>label2.ZOrder" xml:space="preserve">
<value>3</value>
</data>
- <data name="sizeGroup.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Top</value>
- </data>
- <data name="sizeGroup.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 0</value>
- </data>
- <data name="sizeGroup.Size" type="System.Drawing.Size, System.Drawing">
- <value>297, 80</value>
- </data>
- <data name="sizeGroup.TabIndex" type="System.Int32, mscorlib">
- <value>1</value>
- </data>
- <data name="sizeGroup.Text" xml:space="preserve">
- <value>Size</value>
- </data>
- <data name=">>sizeGroup.Name" xml:space="preserve">
- <value>sizeGroup</value>
- </data>
- <data name=">>sizeGroup.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>sizeGroup.Parent" xml:space="preserve">
- <value>propertyPanel</value>
- </data>
- <data name=">>sizeGroup.ZOrder" xml:space="preserve">
- <value>1</value>
- </data>
- <data name="propertyPanel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Top</value>
- </data>
- <data name="propertyPanel.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 208</value>
- </data>
- <data name="propertyPanel.Size" type="System.Drawing.Size, System.Drawing">
- <value>297, 232</value>
- </data>
- <data name="propertyPanel.TabIndex" type="System.Int32, mscorlib">
- <value>5</value>
- </data>
- <data name=">>propertyPanel.Name" xml:space="preserve">
- <value>propertyPanel</value>
- </data>
- <data name=">>propertyPanel.Type" xml:space="preserve">
- <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>propertyPanel.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>propertyPanel.ZOrder" xml:space="preserve">
- <value>1</value>
- </data>
- <data name="previewPicture.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
- <value>Top, Left, Right</value>
- </data>
- <data name="previewPicture.Location" type="System.Drawing.Point, System.Drawing">
- <value>8, 16</value>
- </data>
- <data name="previewPicture.Size" type="System.Drawing.Size, System.Drawing">
- <value>281, 24</value>
- </data>
- <data name="previewPicture.TabIndex" type="System.Int32, mscorlib">
- <value>0</value>
- </data>
<data name=">>previewPicture.Name" xml:space="preserve">
<value>previewPicture</value>
</data>
@@ -600,8 +672,32 @@
<data name=">>previewGroup.ZOrder" xml:space="preserve">
<value>0</value>
</data>
+ <data name="previewPicture.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Left, Right</value>
+ </data>
+ <data name="previewPicture.Location" type="System.Drawing.Point, System.Drawing">
+ <value>8, 16</value>
+ </data>
+ <data name="previewPicture.Size" type="System.Drawing.Size, System.Drawing">
+ <value>281, 24</value>
+ </data>
+ <data name="previewPicture.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name=">>previewPicture.Name" xml:space="preserve">
+ <value>previewPicture</value>
+ </data>
+ <data name=">>previewPicture.Type" xml:space="preserve">
+ <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>previewPicture.Parent" xml:space="preserve">
+ <value>previewGroup</value>
+ </data>
+ <data name=">>previewPicture.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
<metadata name="ComboBoxDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
+ <value>122, 17</value>
</metadata>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
More information about the mapguide-commits
mailing list