[mapguide-commits] r4428 - in trunk/Tools/Maestro:
Maestro/ResourceEditors Maestro/ResourceEditors/GeometryStyleEditors
MaestroAPI/Generated
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sat Dec 12 18:01:22 EST 2009
Author: ksgeograf
Date: 2009-12-12 18:01:21 -0500 (Sat, 12 Dec 2009)
New Revision: 4428
Added:
trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/ColorComboWithTransparency.Designer.cs
trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/ColorComboWithTransparency.cs
trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/ColorComboWithTransparency.resx
Modified:
trunk/Tools/Maestro/Maestro/ResourceEditors/FeaturePreviewRender.cs
trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/AreaFeatureStyleEditor.cs
trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/AreaFeatureStyleEditor.resx
trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FillStyleEditor.cs
trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FillStyleEditor.resx
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/ResourceEditors.csproj
trunk/Tools/Maestro/MaestroAPI/Generated/LayerDefinition-1.2.0.cs
Log:
Maestro:
Fixed issue #1164.
Fixed issue #1165.
All colors pickers are now fitted with a transparency slider.
Also added support for previews of fonts with Ghosted or Opaque background.
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/FeaturePreviewRender.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/FeaturePreviewRender.cs 2009-12-12 19:27:41 UTC (rev 4427)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/FeaturePreviewRender.cs 2009-12-12 23:01:21 UTC (rev 4428)
@@ -132,6 +132,8 @@
Color foreground;
Color background;
string text = "";
+ OSGeo.MapGuide.MaestroAPI.BackgroundStyleType bgStyle;
+
if (item == null || item.FontName == null)
{
@@ -139,6 +141,7 @@
foreground = Color.Black;
background = Color.White;
text = Strings.Common.EmptyText;
+ bgStyle = OSGeo.MapGuide.MaestroAPI.BackgroundStyleType.Transparent;
}
else
{
@@ -146,6 +149,7 @@
catch { font = new Font("Arial", 12); }
foreground = item.ForegroundColor;
background = item.BackgroundColor;
+ bgStyle = item.BackgroundStyle;
FontStyle fs = FontStyle.Regular;
if (item.Bold == "true")
@@ -159,10 +163,34 @@
text = item.Text;
}
- //TODO: Use the BagroundStyle to render rectangles and ghost effects
-
- using(Brush b = new SolidBrush(foreground))
- g.DrawString(text, font, b, size);
+ if (bgStyle == OSGeo.MapGuide.MaestroAPI.BackgroundStyleType.Ghosted)
+ {
+ using (System.Drawing.Drawing2D.GraphicsPath pth = new System.Drawing.Drawing2D.GraphicsPath())
+ {
+ g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
+ g.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.HighQualityBicubic;
+
+ pth.AddString(text, font.FontFamily, (int)font.Style, font.Size * 1.25f, size.Location, StringFormat.GenericDefault);
+
+ using (Pen p = new Pen(background, 1.5f))
+ g.DrawPath(p, pth);
+
+ using (Brush b = new SolidBrush(foreground))
+ g.FillPath(b, pth);
+ }
+ }
+ else
+ {
+ if (bgStyle == OSGeo.MapGuide.MaestroAPI.BackgroundStyleType.Opaque)
+ {
+ SizeF bgSize = g.MeasureString(text, font, new SizeF(size.Width, size.Height));
+ using (Brush b = new SolidBrush(background))
+ g.FillRectangle(b, new Rectangle(size.Top, size.Left, (int)bgSize.Width, (int)bgSize.Height));
+ }
+
+ using (Brush b = new SolidBrush(foreground))
+ g.DrawString(text, font, b, size);
+ }
}
public static void RenderPreviewFontSymbol(Graphics g, Rectangle size, OSGeo.MapGuide.MaestroAPI.FontSymbolType item)
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/AreaFeatureStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/AreaFeatureStyleEditor.cs 2009-12-12 19:27:41 UTC (rev 4427)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/AreaFeatureStyleEditor.cs 2009-12-12 23:01:21 UTC (rev 4428)
@@ -35,10 +35,7 @@
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.GroupBox groupBox1;
- private System.Windows.Forms.GroupBox groupBox2;
- private System.Windows.Forms.Label label1;
- private System.Windows.Forms.TrackBar Transparency;
- private System.Windows.Forms.Label percentageLabel;
+ private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.GroupBox previewGroup;
private System.Windows.Forms.PictureBox previewPicture;
/// <summary>
@@ -84,12 +81,12 @@
fillStyleEditor.displayFill.CheckedChanged += new EventHandler(displayFill_CheckedChanged);
fillStyleEditor.fillCombo.SelectedIndexChanged += new EventHandler(fillCombo_SelectedIndexChanged);
- fillStyleEditor.foregroundColor.SelectedIndexChanged += new EventHandler(foregroundColor_SelectedIndexChanged);
- fillStyleEditor.backgroundColor.SelectedIndexChanged += new EventHandler(backgroundColor_SelectedIndexChanged);
+ fillStyleEditor.foregroundColor.CurrentColorChanged += new EventHandler(foregroundColor_CurrentColorChanged);
+ fillStyleEditor.backgroundColor.CurrentColorChanged += new EventHandler(backgroundColor_CurrentColorChanged);
lineStyleEditor.displayLine.CheckedChanged += new EventHandler(displayLine_CheckedChanged);
lineStyleEditor.thicknessUpDown.ValueChanged += new EventHandler(thicknessCombo_SelectedIndexChanged);
- lineStyleEditor.colorCombo.SelectedIndexChanged += new EventHandler(colorCombo_SelectedIndexChanged);
+ lineStyleEditor.colorCombo.CurrentColorChanged += new EventHandler(colorCombo_CurrentColorChanged);
lineStyleEditor.fillCombo.SelectedIndexChanged += new EventHandler(fillCombo_Line_SelectedIndexChanged);
}
@@ -130,9 +127,6 @@
this.label3 = new System.Windows.Forms.Label();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.percentageLabel = new System.Windows.Forms.Label();
- this.Transparency = new System.Windows.Forms.TrackBar();
- this.label1 = new System.Windows.Forms.Label();
this.previewGroup = new System.Windows.Forms.GroupBox();
this.previewPicture = new System.Windows.Forms.PictureBox();
this.ComboBoxDataSet = new System.Data.DataSet();
@@ -140,7 +134,6 @@
((System.ComponentModel.ISupportInitialize)(this.SizeContextTable)).BeginInit();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.Transparency)).BeginInit();
this.previewGroup.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.previewPicture)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.ComboBoxDataSet)).BeginInit();
@@ -232,31 +225,10 @@
// groupBox2
//
resources.ApplyResources(this.groupBox2, "groupBox2");
- this.groupBox2.Controls.Add(this.percentageLabel);
- this.groupBox2.Controls.Add(this.Transparency);
- this.groupBox2.Controls.Add(this.label1);
this.groupBox2.Controls.Add(this.fillStyleEditor);
this.groupBox2.Name = "groupBox2";
this.groupBox2.TabStop = false;
//
- // percentageLabel
- //
- resources.ApplyResources(this.percentageLabel, "percentageLabel");
- this.percentageLabel.Name = "percentageLabel";
- //
- // Transparency
- //
- resources.ApplyResources(this.Transparency, "Transparency");
- this.Transparency.Maximum = 255;
- this.Transparency.Name = "Transparency";
- this.Transparency.TickFrequency = 25;
- this.Transparency.ValueChanged += new System.EventHandler(this.Transparency_ValueChanged);
- //
- // label1
- //
- resources.ApplyResources(this.label1, "label1");
- this.label1.Name = "label1";
- //
// previewGroup
//
resources.ApplyResources(this.previewGroup, "previewGroup");
@@ -293,8 +265,6 @@
((System.ComponentModel.ISupportInitialize)(this.SizeContextTable)).EndInit();
this.groupBox1.ResumeLayout(false);
this.groupBox2.ResumeLayout(false);
- this.groupBox2.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.Transparency)).EndInit();
this.previewGroup.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.previewPicture)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.ComboBoxDataSet)).EndInit();
@@ -326,13 +296,8 @@
fillStyleEditor.displayFill.Checked = m_item.Fill != null;
if (m_item.Fill != null)
{
- int alpha = Transparency.Maximum - m_item.Fill.ForegroundColor.A;
- fillStyleEditor.foregroundColor.CurrentColor = Color.FromArgb(255, m_item.Fill.ForegroundColor);
- if (m_item.Fill.BackgroundColor.A == 0)
- fillStyleEditor.backgroundColor.CurrentColor = Color.Transparent;
- else
- fillStyleEditor.backgroundColor.CurrentColor = Color.FromArgb(255, m_item.Fill.BackgroundColor);
- Transparency.Value = alpha;
+ fillStyleEditor.foregroundColor.CurrentColor = m_item.Fill.ForegroundColor;
+ fillStyleEditor.backgroundColor.CurrentColor = m_item.Fill.BackgroundColor;
fillStyleEditor.fillCombo.SelectedValue = m_item.Fill.FillPattern;
if (fillStyleEditor.fillCombo.SelectedItem == null && fillStyleEditor.fillCombo.Items.Count > 0)
@@ -344,7 +309,6 @@
{
sizeUnitsCombo.SelectedValue = m_item.Stroke.Unit.ToString();
//sizeContextCombo.SelectedValue = st.??;
- //TODO: Should probably allow user to select a 'null' color?
if (m_item.Stroke.ColorAsHTML != null)
lineStyleEditor.colorCombo.CurrentColor = m_item.Stroke.Color;
lineStyleEditor.fillCombo.SelectedIndex = lineStyleEditor.fillCombo.FindString(m_item.Stroke.LineStyle);
@@ -353,7 +317,6 @@
lineStyleEditor.thicknessUpDown.Value = (decimal)o;
else
lineStyleEditor.thicknessUpDown.Value = 0;
-
}
m_inUpdate = true;
@@ -409,30 +372,23 @@
Changed(this, new EventArgs());
}
- private void foregroundColor_SelectedIndexChanged(object sender, EventArgs e)
+ private void foregroundColor_CurrentColorChanged(object sender, EventArgs e)
{
if (m_inUpdate)
return;
- m_item.Fill.ForegroundColor = Color.FromArgb(Transparency.Maximum - Transparency.Value, fillStyleEditor.foregroundColor.CurrentColor);
+ m_item.Fill.ForegroundColor = fillStyleEditor.foregroundColor.CurrentColor;
previewPicture.Refresh();
if (Changed != null)
Changed(this, new EventArgs());
}
- private void backgroundColor_SelectedIndexChanged(object sender, EventArgs e)
+ private void backgroundColor_CurrentColorChanged(object sender, EventArgs e)
{
if (m_inUpdate)
return;
- int transparency;
-
- if (fillStyleEditor.backgroundColor.CurrentColor.A == 0)
- transparency = 0;
- else
- transparency = Transparency.Maximum - Transparency.Value;
-
- m_item.Fill.BackgroundColor = Color.FromArgb(transparency, fillStyleEditor.backgroundColor.CurrentColor);
+ m_item.Fill.BackgroundColor = fillStyleEditor.backgroundColor.CurrentColor;
previewPicture.Refresh();
if (Changed != null)
Changed(this, new EventArgs());
@@ -468,7 +424,7 @@
Changed(this, new EventArgs());
}
- private void colorCombo_SelectedIndexChanged(object sender, EventArgs e)
+ private void colorCombo_CurrentColorChanged(object sender, EventArgs e)
{
if (m_inUpdate)
return;
@@ -491,26 +447,6 @@
Changed(this, new EventArgs());
}
- private void Transparency_ValueChanged(object sender, EventArgs e)
- {
- percentageLabel.Text = ((int)((Transparency.Value / 255.0) * 100)).ToString() + "%";
-
- if (m_inUpdate)
- return;
- if (m_item.Fill.BackgroundColorAsHTML == null)
- m_item.Fill.BackgroundColor = Color.Black;
- if (m_item.Fill.ForegroundColorAsHTML == null)
- m_item.Fill.ForegroundColor = Color.White;
-
- m_item.Fill.BackgroundColor = Color.FromArgb(Transparency.Maximum - Transparency.Value, m_item.Fill.BackgroundColor);
- m_item.Fill.ForegroundColor = Color.FromArgb(Transparency.Maximum - Transparency.Value, m_item.Fill.ForegroundColor);
-
- previewPicture.Refresh();
- if (Changed != null)
- Changed(this, new EventArgs());
-
- }
-
internal void SetupForTheming()
{
fillStyleEditor.foregroundColor.Enabled =
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/AreaFeatureStyleEditor.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/AreaFeatureStyleEditor.resx 2009-12-12 19:27:41 UTC (rev 4427)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/AreaFeatureStyleEditor.resx 2009-12-12 23:01:21 UTC (rev 4428)
@@ -126,7 +126,7 @@
<value>16, 16</value>
</data>
<data name="fillStyleEditor.Size" type="System.Drawing.Size, System.Drawing">
- <value>218, 104</value>
+ <value>274, 144</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="fillStyleEditor.TabIndex" type="System.Int32, mscorlib">
@@ -136,13 +136,13 @@
<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.4347, Culture=neutral, PublicKeyToken=null</value>
+ <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.FillStyleEditor, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4358, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>fillStyleEditor.Parent" xml:space="preserve">
<value>groupBox2</value>
</data>
<data name=">>fillStyleEditor.ZOrder" xml:space="preserve">
- <value>3</value>
+ <value>0</value>
</data>
<data name="lineStyleEditor.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
@@ -151,7 +151,7 @@
<value>16, 16</value>
</data>
<data name="lineStyleEditor.Size" type="System.Drawing.Size, System.Drawing">
- <value>218, 112</value>
+ <value>274, 136</value>
</data>
<data name="lineStyleEditor.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -160,7 +160,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.4347, Culture=neutral, PublicKeyToken=null</value>
+ <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.LineStyleEditor, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4358, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>lineStyleEditor.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -172,10 +172,10 @@
<value>Top, Left, Right</value>
</data>
<data name="sizeUnitsCombo.Location" type="System.Drawing.Point, System.Drawing">
- <value>136, 152</value>
+ <value>136, 184</value>
</data>
<data name="sizeUnitsCombo.Size" type="System.Drawing.Size, System.Drawing">
- <value>98, 21</value>
+ <value>154, 21</value>
</data>
<data name="sizeUnitsCombo.TabIndex" type="System.Int32, mscorlib">
<value>13</value>
@@ -196,10 +196,10 @@
<value>Top, Left, Right</value>
</data>
<data name="sizeContextCombo.Location" type="System.Drawing.Point, System.Drawing">
- <value>136, 120</value>
+ <value>136, 152</value>
</data>
<data name="sizeContextCombo.Size" type="System.Drawing.Size, System.Drawing">
- <value>98, 21</value>
+ <value>154, 21</value>
</data>
<data name="sizeContextCombo.TabIndex" type="System.Int32, mscorlib">
<value>12</value>
@@ -217,7 +217,7 @@
<value>1</value>
</data>
<data name="label4.Location" type="System.Drawing.Point, System.Drawing">
- <value>16, 152</value>
+ <value>16, 184</value>
</data>
<data name="label4.Size" type="System.Drawing.Size, System.Drawing">
<value>88, 16</value>
@@ -241,7 +241,7 @@
<value>2</value>
</data>
<data name="label3.Location" type="System.Drawing.Point, System.Drawing">
- <value>16, 120</value>
+ <value>16, 152</value>
</data>
<data name="label3.Size" type="System.Drawing.Size, System.Drawing">
<value>88, 16</value>
@@ -271,7 +271,7 @@
<value>0, 176</value>
</data>
<data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
- <value>242, 184</value>
+ <value>298, 208</value>
</data>
<data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
<value>14</value>
@@ -294,89 +294,11 @@
<data name="groupBox2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
- <data name="percentageLabel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
- <value>Top, Right</value>
- </data>
- <data name="percentageLabel.Location" type="System.Drawing.Point, System.Drawing">
- <value>194, 128</value>
- </data>
- <data name="percentageLabel.Size" type="System.Drawing.Size, System.Drawing">
- <value>40, 16</value>
- </data>
- <data name="percentageLabel.TabIndex" type="System.Int32, mscorlib">
- <value>3</value>
- </data>
- <data name="percentageLabel.Text" xml:space="preserve">
- <value>0%</value>
- </data>
- <data name="percentageLabel.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
- <value>TopRight</value>
- </data>
- <data name=">>percentageLabel.Name" xml:space="preserve">
- <value>percentageLabel</value>
- </data>
- <data name=">>percentageLabel.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=">>percentageLabel.Parent" xml:space="preserve">
- <value>groupBox2</value>
- </data>
- <data name=">>percentageLabel.ZOrder" xml:space="preserve">
- <value>0</value>
- </data>
- <data name="Transparency.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
- <value>Top, Left, Right</value>
- </data>
- <data name="Transparency.Location" type="System.Drawing.Point, System.Drawing">
- <value>136, 120</value>
- </data>
- <data name="Transparency.Size" type="System.Drawing.Size, System.Drawing">
- <value>58, 45</value>
- </data>
- <data name="Transparency.TabIndex" type="System.Int32, mscorlib">
- <value>2</value>
- </data>
- <data name=">>Transparency.Name" xml:space="preserve">
- <value>Transparency</value>
- </data>
- <data name=">>Transparency.Type" xml:space="preserve">
- <value>System.Windows.Forms.TrackBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>Transparency.Parent" xml:space="preserve">
- <value>groupBox2</value>
- </data>
- <data name=">>Transparency.ZOrder" xml:space="preserve">
- <value>1</value>
- </data>
- <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
- <value>16, 128</value>
- </data>
- <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
- <value>104, 16</value>
- </data>
- <data name="label1.TabIndex" type="System.Int32, mscorlib">
- <value>1</value>
- </data>
- <data name="label1.Text" xml:space="preserve">
- <value>Transparency</value>
- </data>
- <data name=">>label1.Name" xml:space="preserve">
- <value>label1</value>
- </data>
- <data name=">>label1.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=">>label1.Parent" xml:space="preserve">
- <value>groupBox2</value>
- </data>
- <data name=">>label1.ZOrder" xml:space="preserve">
- <value>2</value>
- </data>
<data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
- <value>242, 168</value>
+ <value>298, 168</value>
</data>
<data name="groupBox2.TabIndex" type="System.Int32, mscorlib">
<value>15</value>
@@ -406,7 +328,7 @@
<value>8, 16</value>
</data>
<data name="previewPicture.Size" type="System.Drawing.Size, System.Drawing">
- <value>226, 24</value>
+ <value>282, 24</value>
</data>
<data name="previewPicture.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -424,10 +346,10 @@
<value>0</value>
</data>
<data name="previewGroup.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 368</value>
+ <value>0, 392</value>
</data>
<data name="previewGroup.Size" type="System.Drawing.Size, System.Drawing">
- <value>242, 48</value>
+ <value>298, 48</value>
</data>
<data name="previewGroup.TabIndex" type="System.Int32, mscorlib">
<value>19</value>
@@ -457,10 +379,10 @@
<value>True</value>
</data>
<data name="$this.AutoScrollMinSize" type="System.Drawing.Size, System.Drawing">
- <value>244, 416</value>
+ <value>300, 440</value>
</data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
- <value>244, 416</value>
+ <value>300, 440</value>
</data>
<data name=">>UnitsTable.Name" xml:space="preserve">
<value>UnitsTable</value>
Added: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/ColorComboWithTransparency.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/ColorComboWithTransparency.Designer.cs (rev 0)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/ColorComboWithTransparency.Designer.cs 2009-12-12 23:01:21 UTC (rev 4428)
@@ -0,0 +1,90 @@
+namespace OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors
+{
+ partial class ColorComboWithTransparency
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Component Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.transparencySlider = new System.Windows.Forms.TrackBar();
+ this.percentageLabel = new System.Windows.Forms.Label();
+ this.colorCombo = new OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboBox();
+ ((System.ComponentModel.ISupportInitialize)(this.transparencySlider)).BeginInit();
+ this.SuspendLayout();
+ //
+ // transparencySlider
+ //
+ this.transparencySlider.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.transparencySlider.Location = new System.Drawing.Point(0, 24);
+ this.transparencySlider.Maximum = 255;
+ this.transparencySlider.Name = "transparencySlider";
+ this.transparencySlider.Size = new System.Drawing.Size(256, 45);
+ this.transparencySlider.TabIndex = 1;
+ this.transparencySlider.TickStyle = System.Windows.Forms.TickStyle.None;
+ this.transparencySlider.ValueChanged += new System.EventHandler(this.transparencySlider_ValueChanged);
+ //
+ // percentageLabel
+ //
+ this.percentageLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.percentageLabel.Location = new System.Drawing.Point(264, 24);
+ this.percentageLabel.Name = "percentageLabel";
+ this.percentageLabel.Size = new System.Drawing.Size(36, 23);
+ this.percentageLabel.TabIndex = 2;
+ this.percentageLabel.Text = "0%";
+ this.percentageLabel.TextAlign = System.Drawing.ContentAlignment.TopRight;
+ //
+ // colorCombo
+ //
+ this.colorCombo.Dock = System.Windows.Forms.DockStyle.Top;
+ this.colorCombo.FormattingEnabled = true;
+ this.colorCombo.Location = new System.Drawing.Point(0, 0);
+ this.colorCombo.Name = "colorCombo";
+ this.colorCombo.Size = new System.Drawing.Size(305, 21);
+ this.colorCombo.TabIndex = 0;
+ this.colorCombo.SelectedIndexChanged += new System.EventHandler(this.colorCombo_SelectedIndexChanged);
+ //
+ // ColorComboWithTransparency
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.percentageLabel);
+ this.Controls.Add(this.transparencySlider);
+ this.Controls.Add(this.colorCombo);
+ this.Name = "ColorComboWithTransparency";
+ this.Size = new System.Drawing.Size(305, 49);
+ ((System.ComponentModel.ISupportInitialize)(this.transparencySlider)).EndInit();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private ColorComboBox colorCombo;
+ private System.Windows.Forms.TrackBar transparencySlider;
+ private System.Windows.Forms.Label percentageLabel;
+ }
+}
Added: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/ColorComboWithTransparency.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/ColorComboWithTransparency.cs (rev 0)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/ColorComboWithTransparency.cs 2009-12-12 23:01:21 UTC (rev 4428)
@@ -0,0 +1,71 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+
+namespace OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors
+{
+ public partial class ColorComboWithTransparency : UserControl
+ {
+ private bool m_isUpdating = false;
+
+ public ColorComboWithTransparency()
+ {
+ InitializeComponent();
+ colorCombo.AllowTransparent = true;
+ colorCombo.ResetColors();
+ }
+
+ public event EventHandler CurrentColorChanged;
+
+ public Color CurrentColor
+ {
+ get { return Color.FromArgb((byte.MaxValue - transparencySlider.Value), colorCombo.CurrentColor); }
+ set
+ {
+ try
+ {
+ m_isUpdating = true;
+
+ if (value.A == 0)
+ colorCombo.CurrentColor = Color.Transparent;
+ else
+ colorCombo.CurrentColor = Color.FromArgb(byte.MaxValue, value);
+ transparencySlider.Value = byte.MaxValue - value.A;
+
+ if (CurrentColorChanged != null)
+ CurrentColorChanged(this, null);
+
+ colorCombo.Refresh();
+ }
+ finally
+ {
+ m_isUpdating = false;
+ }
+ }
+ }
+
+ private void colorCombo_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (m_isUpdating)
+ return;
+
+ if (CurrentColorChanged != null)
+ CurrentColorChanged(this, null);
+ }
+
+ private void transparencySlider_ValueChanged(object sender, EventArgs e)
+ {
+ percentageLabel.Text = ((int)((transparencySlider.Value / (double)byte.MaxValue) * 100)).ToString() + "%";
+
+ if (m_isUpdating)
+ return;
+
+ if (CurrentColorChanged != null)
+ CurrentColorChanged(this, null);
+ }
+ }
+}
Added: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/ColorComboWithTransparency.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/ColorComboWithTransparency.resx (rev 0)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/ColorComboWithTransparency.resx 2009-12-12 23:01:21 UTC (rev 4428)
@@ -0,0 +1,120 @@
+<?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>
+</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FillStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FillStyleEditor.cs 2009-12-12 19:27:41 UTC (rev 4427)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FillStyleEditor.cs 2009-12-12 23:01:21 UTC (rev 4428)
@@ -31,15 +31,17 @@
/// Summary description for FillStyleEditor.
/// </summary>
public class FillStyleEditor : System.Windows.Forms.UserControl
- {
- public ResourceEditors.GeometryStyleEditors.ColorComboBox foregroundColor;
- public ResourceEditors.GeometryStyleEditors.ColorComboBox backgroundColor;
+ {
public ResourceEditors.GeometryStyleEditors.ImageStylePicker fillCombo;
public System.Windows.Forms.CheckBox displayFill;
private System.Windows.Forms.Label lblBackground;
public Label lblForeground;
- private System.Windows.Forms.Label lblFill;
+ private System.Windows.Forms.Label lblFill;
+ public ColorComboWithTransparency foregroundColor;
+ public Label lblForegroundTransparency;
+ public ColorComboWithTransparency backgroundColor;
+ public Label lblBackgroundTransparency;
/// <summary>
/// Required designer variable.
@@ -51,12 +53,6 @@
// This call is required by the Windows.Forms Form Designer.
InitializeComponent();
- foregroundColor.AllowTransparent = true;
- backgroundColor.AllowTransparent = true;
-
- foregroundColor.ResetColors();
- backgroundColor.ResetColors();
-
fillCombo.Items.Clear();
fillCombo.Items.AddRange(FeaturePreviewRender.FillImages);
}
@@ -87,10 +83,12 @@
this.lblBackground = new System.Windows.Forms.Label();
this.lblForeground = new System.Windows.Forms.Label();
this.lblFill = new System.Windows.Forms.Label();
- this.foregroundColor = new OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboBox();
- this.backgroundColor = new OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboBox();
this.fillCombo = new OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ImageStylePicker();
this.displayFill = new System.Windows.Forms.CheckBox();
+ this.foregroundColor = new OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboWithTransparency();
+ this.lblForegroundTransparency = new System.Windows.Forms.Label();
+ this.backgroundColor = new OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboWithTransparency();
+ this.lblBackgroundTransparency = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// lblBackground
@@ -108,16 +106,6 @@
resources.ApplyResources(this.lblFill, "lblFill");
this.lblFill.Name = "lblFill";
//
- // foregroundColor
- //
- resources.ApplyResources(this.foregroundColor, "foregroundColor");
- this.foregroundColor.Name = "foregroundColor";
- //
- // backgroundColor
- //
- resources.ApplyResources(this.backgroundColor, "backgroundColor");
- this.backgroundColor.Name = "backgroundColor";
- //
// fillCombo
//
resources.ApplyResources(this.fillCombo, "fillCombo");
@@ -134,12 +122,36 @@
this.displayFill.Name = "displayFill";
this.displayFill.CheckedChanged += new System.EventHandler(this.displayFill_CheckedChanged);
//
+ // foregroundColor
+ //
+ resources.ApplyResources(this.foregroundColor, "foregroundColor");
+ this.foregroundColor.CurrentColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+ this.foregroundColor.Name = "foregroundColor";
+ //
+ // lblForegroundTransparency
+ //
+ resources.ApplyResources(this.lblForegroundTransparency, "lblForegroundTransparency");
+ this.lblForegroundTransparency.Name = "lblForegroundTransparency";
+ //
+ // backgroundColor
+ //
+ resources.ApplyResources(this.backgroundColor, "backgroundColor");
+ this.backgroundColor.CurrentColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+ this.backgroundColor.Name = "backgroundColor";
+ //
+ // lblBackgroundTransparency
+ //
+ resources.ApplyResources(this.lblBackgroundTransparency, "lblBackgroundTransparency");
+ this.lblBackgroundTransparency.Name = "lblBackgroundTransparency";
+ //
// FillStyleEditor
//
+ this.Controls.Add(this.lblBackgroundTransparency);
+ this.Controls.Add(this.backgroundColor);
+ this.Controls.Add(this.lblForegroundTransparency);
+ this.Controls.Add(this.foregroundColor);
this.Controls.Add(this.displayFill);
this.Controls.Add(this.fillCombo);
- this.Controls.Add(this.backgroundColor);
- this.Controls.Add(this.foregroundColor);
this.Controls.Add(this.lblBackground);
this.Controls.Add(this.lblForeground);
this.Controls.Add(this.lblFill);
@@ -147,6 +159,7 @@
resources.ApplyResources(this, "$this");
this.Load += new System.EventHandler(this.FillStyleEditor_Load);
this.ResumeLayout(false);
+ this.PerformLayout();
}
#endregion
@@ -160,6 +173,8 @@
lblFill.Enabled =
lblForeground.Enabled =
lblBackground.Enabled =
+ lblForegroundTransparency.Enabled =
+ lblBackgroundTransparency.Enabled =
fillCombo.Enabled =
foregroundColor.Enabled =
backgroundColor.Enabled =
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FillStyleEditor.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FillStyleEditor.resx 2009-12-12 19:27:41 UTC (rev 4427)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FillStyleEditor.resx 2009-12-12 23:01:21 UTC (rev 4428)
@@ -117,14 +117,17 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="lblBackground.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="lblBackground.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 80</value>
+ <value>0, 104</value>
</data>
<data name="lblBackground.Size" type="System.Drawing.Size, System.Drawing">
- <value>96, 16</value>
+ <value>91, 13</value>
</data>
- <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="lblBackground.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
</data>
@@ -141,13 +144,16 @@
<value>$this</value>
</data>
<data name=">>lblBackground.ZOrder" xml:space="preserve">
- <value>4</value>
+ <value>6</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>0, 48</value>
</data>
<data name="lblForeground.Size" type="System.Drawing.Size, System.Drawing">
- <value>96, 16</value>
+ <value>87, 13</value>
</data>
<data name="lblForeground.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
@@ -165,13 +171,16 @@
<value>$this</value>
</data>
<data name=">>lblForeground.ZOrder" xml:space="preserve">
- <value>5</value>
+ <value>7</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, 24</value>
</data>
<data name="lblFill.Size" type="System.Drawing.Size, System.Drawing">
- <value>96, 16</value>
+ <value>55, 13</value>
</data>
<data name="lblFill.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
@@ -189,26 +198,77 @@
<value>$this</value>
</data>
<data name=">>lblFill.ZOrder" xml:space="preserve">
- <value>6</value>
+ <value>8</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="fillCombo.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Left, Right</value>
+ </data>
+ <data name="fillCombo.Location" type="System.Drawing.Point, System.Drawing">
+ <value>120, 16</value>
+ </data>
+ <data name="fillCombo.Size" type="System.Drawing.Size, System.Drawing">
+ <value>184, 21</value>
+ </data>
+ <data name="fillCombo.TabIndex" type="System.Int32, mscorlib">
+ <value>12</value>
+ </data>
+ <data name=">>fillCombo.Name" xml:space="preserve">
+ <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>
+ </data>
+ <data name=">>fillCombo.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>fillCombo.ZOrder" xml:space="preserve">
+ <value>5</value>
+ </data>
+ <data name="displayFill.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
+ <value>System</value>
+ </data>
+ <data name="displayFill.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 0</value>
+ </data>
+ <data name="displayFill.Size" type="System.Drawing.Size, System.Drawing">
+ <value>168, 16</value>
+ </data>
+ <data name="displayFill.TabIndex" type="System.Int32, mscorlib">
+ <value>13</value>
+ </data>
+ <data name="displayFill.Text" xml:space="preserve">
+ <value>Display fill</value>
+ </data>
+ <data name=">>displayFill.Name" xml:space="preserve">
+ <value>displayFill</value>
+ </data>
+ <data name=">>displayFill.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>displayFill.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>displayFill.ZOrder" xml:space="preserve">
+ <value>4</value>
+ </data>
<data name="foregroundColor.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="foregroundColor.Location" type="System.Drawing.Point, System.Drawing">
- <value>120, 48</value>
+ <value>120, 40</value>
</data>
<data name="foregroundColor.Size" type="System.Drawing.Size, System.Drawing">
- <value>184, 21</value>
+ <value>184, 49</value>
</data>
<data name="foregroundColor.TabIndex" type="System.Int32, mscorlib">
- <value>10</value>
+ <value>14</value>
</data>
<data name=">>foregroundColor.Name" xml:space="preserve">
<value>foregroundColor</value>
</data>
<data name=">>foregroundColor.Type" xml:space="preserve">
- <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboBox, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4347, Culture=neutral, PublicKeyToken=null</value>
+ <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboWithTransparency, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4358, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>foregroundColor.Parent" xml:space="preserve">
<value>$this</value>
@@ -216,86 +276,95 @@
<data name=">>foregroundColor.ZOrder" xml:space="preserve">
<value>3</value>
</data>
- <data name="backgroundColor.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
- <value>Top, Left, Right</value>
+ <data name="lblForegroundTransparency.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
</data>
- <data name="backgroundColor.Location" type="System.Drawing.Point, System.Drawing">
- <value>120, 80</value>
+ <data name="lblForegroundTransparency.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
</data>
- <data name="backgroundColor.Size" type="System.Drawing.Size, System.Drawing">
- <value>184, 21</value>
+ <data name="lblForegroundTransparency.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 72</value>
</data>
- <data name="backgroundColor.TabIndex" type="System.Int32, mscorlib">
- <value>11</value>
+ <data name="lblForegroundTransparency.Size" type="System.Drawing.Size, System.Drawing">
+ <value>72, 13</value>
</data>
- <data name=">>backgroundColor.Name" xml:space="preserve">
- <value>backgroundColor</value>
+ <data name="lblForegroundTransparency.TabIndex" type="System.Int32, mscorlib">
+ <value>15</value>
</data>
- <data name=">>backgroundColor.Type" xml:space="preserve">
- <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboBox, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4347, Culture=neutral, PublicKeyToken=null</value>
+ <data name="lblForegroundTransparency.Text" xml:space="preserve">
+ <value>Transparency</value>
</data>
- <data name=">>backgroundColor.Parent" xml:space="preserve">
+ <data name=">>lblForegroundTransparency.Name" xml:space="preserve">
+ <value>lblForegroundTransparency</value>
+ </data>
+ <data name=">>lblForegroundTransparency.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=">>lblForegroundTransparency.Parent" xml:space="preserve">
<value>$this</value>
</data>
- <data name=">>backgroundColor.ZOrder" xml:space="preserve">
+ <data name=">>lblForegroundTransparency.ZOrder" xml:space="preserve">
<value>2</value>
</data>
- <data name="fillCombo.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <data name="backgroundColor.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
- <data name="fillCombo.Location" type="System.Drawing.Point, System.Drawing">
- <value>120, 16</value>
+ <data name="backgroundColor.Location" type="System.Drawing.Point, System.Drawing">
+ <value>120, 96</value>
</data>
- <data name="fillCombo.Size" type="System.Drawing.Size, System.Drawing">
- <value>184, 21</value>
+ <data name="backgroundColor.Size" type="System.Drawing.Size, System.Drawing">
+ <value>184, 49</value>
</data>
- <data name="fillCombo.TabIndex" type="System.Int32, mscorlib">
- <value>12</value>
+ <data name="backgroundColor.TabIndex" type="System.Int32, mscorlib">
+ <value>16</value>
</data>
- <data name=">>fillCombo.Name" xml:space="preserve">
- <value>fillCombo</value>
+ <data name=">>backgroundColor.Name" xml:space="preserve">
+ <value>backgroundColor</value>
</data>
- <data name=">>fillCombo.Type" xml:space="preserve">
- <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ImageStylePicker, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4347, Culture=neutral, PublicKeyToken=null</value>
+ <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>
</data>
- <data name=">>fillCombo.Parent" xml:space="preserve">
+ <data name=">>backgroundColor.Parent" xml:space="preserve">
<value>$this</value>
</data>
- <data name=">>fillCombo.ZOrder" xml:space="preserve">
+ <data name=">>backgroundColor.ZOrder" xml:space="preserve">
<value>1</value>
</data>
- <data name="displayFill.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
- <value>System</value>
+ <data name="lblBackgroundTransparency.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
</data>
- <data name="displayFill.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 0</value>
+ <data name="lblBackgroundTransparency.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
</data>
- <data name="displayFill.Size" type="System.Drawing.Size, System.Drawing">
- <value>168, 16</value>
+ <data name="lblBackgroundTransparency.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 128</value>
</data>
- <data name="displayFill.TabIndex" type="System.Int32, mscorlib">
- <value>13</value>
+ <data name="lblBackgroundTransparency.Size" type="System.Drawing.Size, System.Drawing">
+ <value>72, 13</value>
</data>
- <data name="displayFill.Text" xml:space="preserve">
- <value>Display fill</value>
+ <data name="lblBackgroundTransparency.TabIndex" type="System.Int32, mscorlib">
+ <value>17</value>
</data>
- <data name=">>displayFill.Name" xml:space="preserve">
- <value>displayFill</value>
+ <data name="lblBackgroundTransparency.Text" xml:space="preserve">
+ <value>Transparency</value>
</data>
- <data name=">>displayFill.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name=">>lblBackgroundTransparency.Name" xml:space="preserve">
+ <value>lblBackgroundTransparency</value>
</data>
- <data name=">>displayFill.Parent" xml:space="preserve">
+ <data name=">>lblBackgroundTransparency.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=">>lblBackgroundTransparency.Parent" xml:space="preserve">
<value>$this</value>
</data>
- <data name=">>displayFill.ZOrder" xml:space="preserve">
+ <data name=">>lblBackgroundTransparency.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
- <value>304, 104</value>
+ <value>304, 150</value>
</data>
<data name=">>$this.Name" xml:space="preserve">
<value>FillStyleEditor</value>
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FontStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FontStyleEditor.cs 2009-12-12 19:27:41 UTC (rev 4427)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FontStyleEditor.cs 2009-12-12 23:01:21 UTC (rev 4428)
@@ -54,9 +54,7 @@
private System.Windows.Forms.CheckBox underlineCheck;
private System.Windows.Forms.CheckBox italicCheck;
private System.Windows.Forms.CheckBox boldCheck;
- private System.Windows.Forms.ComboBox backgroundTypeCombo;
- private ColorComboBox backgroundColor;
- private ColorComboBox textColor;
+ private System.Windows.Forms.ComboBox backgroundTypeCombo;
private System.Windows.Forms.ComboBox rotationCombo;
internal System.Windows.Forms.ComboBox verticalCombo;
internal System.Windows.Forms.ComboBox horizontalCombo;
@@ -92,6 +90,10 @@
internal System.Windows.Forms.Label verticalLabel;
internal System.Windows.Forms.Label horizontalLabel;
private CheckBox DisplayLabel;
+ private ColorComboWithTransparency textColor;
+ private Label label12;
+ private Label label11;
+ private ColorComboWithTransparency backgroundColor;
private bool isUpdating = false;
public event EventHandler Changed;
@@ -114,9 +116,6 @@
using(System.IO.MemoryStream ms = new System.IO.MemoryStream(SharedComboDataSet))
ComboBoxDataSet.ReadXml(ms);
-
- backgroundColor.ResetColors();
- textColor.ResetColors();
}
public void SetAvalibleColumns(string[] items)
@@ -221,12 +220,14 @@
this.italicCheck = new System.Windows.Forms.CheckBox();
this.boldCheck = new System.Windows.Forms.CheckBox();
this.colorGroup = new System.Windows.Forms.GroupBox();
+ this.label12 = new System.Windows.Forms.Label();
+ this.label11 = new System.Windows.Forms.Label();
+ this.backgroundColor = new OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboWithTransparency();
+ this.textColor = new OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboWithTransparency();
this.backgroundTypeCombo = new System.Windows.Forms.ComboBox();
this.BackgroundTypeTable = new System.Data.DataTable();
this.dataColumn9 = new System.Data.DataColumn();
this.dataColumn10 = new System.Data.DataColumn();
- this.backgroundColor = new OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboBox();
- this.textColor = new OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboBox();
this.label7 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.label9 = new System.Windows.Forms.Label();
@@ -439,15 +440,41 @@
// colorGroup
//
resources.ApplyResources(this.colorGroup, "colorGroup");
- this.colorGroup.Controls.Add(this.backgroundTypeCombo);
+ this.colorGroup.Controls.Add(this.label12);
+ this.colorGroup.Controls.Add(this.label11);
this.colorGroup.Controls.Add(this.backgroundColor);
this.colorGroup.Controls.Add(this.textColor);
+ this.colorGroup.Controls.Add(this.backgroundTypeCombo);
this.colorGroup.Controls.Add(this.label7);
this.colorGroup.Controls.Add(this.label8);
this.colorGroup.Controls.Add(this.label9);
this.colorGroup.Name = "colorGroup";
this.colorGroup.TabStop = false;
//
+ // label12
+ //
+ resources.ApplyResources(this.label12, "label12");
+ this.label12.Name = "label12";
+ //
+ // label11
+ //
+ resources.ApplyResources(this.label11, "label11");
+ this.label11.Name = "label11";
+ //
+ // backgroundColor
+ //
+ resources.ApplyResources(this.backgroundColor, "backgroundColor");
+ this.backgroundColor.CurrentColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+ this.backgroundColor.Name = "backgroundColor";
+ this.backgroundColor.CurrentColorChanged += new System.EventHandler(this.backgroundColor_SelectedIndexChanged);
+ //
+ // textColor
+ //
+ resources.ApplyResources(this.textColor, "textColor");
+ this.textColor.CurrentColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+ this.textColor.Name = "textColor";
+ this.textColor.CurrentColorChanged += new System.EventHandler(this.textColor_SelectedIndexChanged);
+ //
// backgroundTypeCombo
//
resources.ApplyResources(this.backgroundTypeCombo, "backgroundTypeCombo");
@@ -473,18 +500,6 @@
//
this.dataColumn10.ColumnName = "Value";
//
- // backgroundColor
- //
- resources.ApplyResources(this.backgroundColor, "backgroundColor");
- this.backgroundColor.Name = "backgroundColor";
- this.backgroundColor.SelectedIndexChanged += new System.EventHandler(this.backgroundColor_SelectedIndexChanged);
- //
- // textColor
- //
- resources.ApplyResources(this.textColor, "textColor");
- this.textColor.Name = "textColor";
- this.textColor.SelectedIndexChanged += new System.EventHandler(this.textColor_SelectedIndexChanged);
- //
// label7
//
resources.ApplyResources(this.label7, "label7");
@@ -656,6 +671,7 @@
((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);
((System.ComponentModel.ISupportInitialize)(this.RotationTable)).EndInit();
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FontStyleEditor.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FontStyleEditor.resx 2009-12-12 19:27:41 UTC (rev 4427)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/FontStyleEditor.resx 2009-12-12 23:01:21 UTC (rev 4428)
@@ -549,80 +549,140 @@
<data name="colorGroup.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
- <data name="backgroundTypeCombo.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
- <value>Top, Left, Right</value>
+ <data name="label12.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
</data>
- <data name="backgroundTypeCombo.Location" type="System.Drawing.Point, System.Drawing">
- <value>112, 78</value>
+ <data name="label12.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
</data>
- <data name="backgroundTypeCombo.Size" type="System.Drawing.Size, System.Drawing">
- <value>176, 21</value>
+ <data name="label12.Location" type="System.Drawing.Point, System.Drawing">
+ <value>8, 96</value>
</data>
- <data name="backgroundTypeCombo.TabIndex" type="System.Int32, mscorlib">
- <value>11</value>
+ <data name="label12.Size" type="System.Drawing.Size, System.Drawing">
+ <value>72, 13</value>
</data>
- <data name=">>backgroundTypeCombo.Name" xml:space="preserve">
- <value>backgroundTypeCombo</value>
+ <data name="label12.TabIndex" type="System.Int32, mscorlib">
+ <value>15</value>
</data>
- <data name=">>backgroundTypeCombo.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name="label12.Text" xml:space="preserve">
+ <value>Transparency</value>
</data>
- <data name=">>backgroundTypeCombo.Parent" xml:space="preserve">
+ <data name=">>label12.Name" xml:space="preserve">
+ <value>label12</value>
+ </data>
+ <data name=">>label12.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=">>label12.Parent" xml:space="preserve">
<value>colorGroup</value>
</data>
- <data name=">>backgroundTypeCombo.ZOrder" xml:space="preserve">
+ <data name=">>label12.ZOrder" xml:space="preserve">
<value>0</value>
</data>
+ <data name="label11.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label11.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <data name="label11.Location" type="System.Drawing.Point, System.Drawing">
+ <value>8, 40</value>
+ </data>
+ <data name="label11.Size" type="System.Drawing.Size, System.Drawing">
+ <value>72, 13</value>
+ </data>
+ <data name="label11.TabIndex" type="System.Int32, mscorlib">
+ <value>14</value>
+ </data>
+ <data name="label11.Text" xml:space="preserve">
+ <value>Transparency</value>
+ </data>
+ <data name=">>label11.Name" xml:space="preserve">
+ <value>label11</value>
+ </data>
+ <data name=">>label11.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=">>label11.Parent" xml:space="preserve">
+ <value>colorGroup</value>
+ </data>
+ <data name=">>label11.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
<data name="backgroundColor.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="backgroundColor.Location" type="System.Drawing.Point, System.Drawing">
- <value>112, 46</value>
+ <value>112, 72</value>
</data>
<data name="backgroundColor.Size" type="System.Drawing.Size, System.Drawing">
- <value>176, 21</value>
+ <value>176, 49</value>
</data>
<data name="backgroundColor.TabIndex" type="System.Int32, mscorlib">
- <value>10</value>
+ <value>13</value>
</data>
<data name=">>backgroundColor.Name" xml:space="preserve">
<value>backgroundColor</value>
</data>
<data name=">>backgroundColor.Type" xml:space="preserve">
- <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboBox, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4347, Culture=neutral, PublicKeyToken=null</value>
+ <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboWithTransparency, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4358, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>backgroundColor.Parent" xml:space="preserve">
<value>colorGroup</value>
</data>
<data name=">>backgroundColor.ZOrder" xml:space="preserve">
- <value>1</value>
+ <value>2</value>
</data>
<data name="textColor.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="textColor.Location" type="System.Drawing.Point, System.Drawing">
- <value>112, 14</value>
+ <value>112, 16</value>
</data>
<data name="textColor.Size" type="System.Drawing.Size, System.Drawing">
- <value>176, 21</value>
+ <value>176, 49</value>
</data>
<data name="textColor.TabIndex" type="System.Int32, mscorlib">
- <value>9</value>
+ <value>12</value>
</data>
<data name=">>textColor.Name" xml:space="preserve">
<value>textColor</value>
</data>
<data name=">>textColor.Type" xml:space="preserve">
- <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboBox, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4347, Culture=neutral, PublicKeyToken=null</value>
+ <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboWithTransparency, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4358, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>textColor.Parent" xml:space="preserve">
<value>colorGroup</value>
</data>
<data name=">>textColor.ZOrder" xml:space="preserve">
- <value>2</value>
+ <value>3</value>
</data>
+ <data name="backgroundTypeCombo.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Left, Right</value>
+ </data>
+ <data name="backgroundTypeCombo.Location" type="System.Drawing.Point, System.Drawing">
+ <value>112, 128</value>
+ </data>
+ <data name="backgroundTypeCombo.Size" type="System.Drawing.Size, System.Drawing">
+ <value>176, 21</value>
+ </data>
+ <data name="backgroundTypeCombo.TabIndex" type="System.Int32, mscorlib">
+ <value>11</value>
+ </data>
+ <data name=">>backgroundTypeCombo.Name" xml:space="preserve">
+ <value>backgroundTypeCombo</value>
+ </data>
+ <data name=">>backgroundTypeCombo.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=">>backgroundTypeCombo.Parent" xml:space="preserve">
+ <value>colorGroup</value>
+ </data>
+ <data name=">>backgroundTypeCombo.ZOrder" xml:space="preserve">
+ <value>4</value>
+ </data>
<data name="label7.Location" type="System.Drawing.Point, System.Drawing">
- <value>8, 80</value>
+ <value>8, 130</value>
</data>
<data name="label7.Size" type="System.Drawing.Size, System.Drawing">
<value>96, 16</value>
@@ -643,10 +703,10 @@
<value>colorGroup</value>
</data>
<data name=">>label7.ZOrder" xml:space="preserve">
- <value>3</value>
+ <value>5</value>
</data>
<data name="label8.Location" type="System.Drawing.Point, System.Drawing">
- <value>8, 48</value>
+ <value>8, 72</value>
</data>
<data name="label8.Size" type="System.Drawing.Size, System.Drawing">
<value>80, 16</value>
@@ -667,7 +727,7 @@
<value>colorGroup</value>
</data>
<data name=">>label8.ZOrder" xml:space="preserve">
- <value>4</value>
+ <value>6</value>
</data>
<data name="label9.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 16</value>
@@ -691,13 +751,13 @@
<value>colorGroup</value>
</data>
<data name=">>label9.ZOrder" xml:space="preserve">
- <value>5</value>
+ <value>7</value>
</data>
<data name="colorGroup.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 240</value>
</data>
<data name="colorGroup.Size" type="System.Drawing.Size, System.Drawing">
- <value>296, 112</value>
+ <value>296, 160</value>
</data>
<data name="colorGroup.TabIndex" type="System.Int32, mscorlib">
<value>14</value>
@@ -865,7 +925,7 @@
<value>5</value>
</data>
<data name="alignmentGroup.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 360</value>
+ <value>0, 408</value>
</data>
<data name="alignmentGroup.Size" type="System.Drawing.Size, System.Drawing">
<value>296, 112</value>
@@ -916,7 +976,7 @@
<value>0</value>
</data>
<data name="previewGroup.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 480</value>
+ <value>0, 528</value>
</data>
<data name="previewGroup.Size" type="System.Drawing.Size, System.Drawing">
<value>296, 48</value>
@@ -976,10 +1036,10 @@
<value>True</value>
</data>
<data name="$this.AutoScrollMinSize" type="System.Drawing.Size, System.Drawing">
- <value>296, 531</value>
+ <value>296, 576</value>
</data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
- <value>296, 531</value>
+ <value>296, 576</value>
</data>
<data name=">>UnitsTable.Name" xml:space="preserve">
<value>UnitsTable</value>
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineFeatureStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineFeatureStyleEditor.cs 2009-12-12 19:27:41 UTC (rev 4427)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineFeatureStyleEditor.cs 2009-12-12 23:01:21 UTC (rev 4428)
@@ -88,7 +88,7 @@
lineStyleEditor.displayLine.Visible = false;
lineStyleEditor.thicknessUpDown.ValueChanged +=new EventHandler(thicknessCombo_SelectedIndexChanged);
- lineStyleEditor.colorCombo.SelectedIndexChanged += new EventHandler(colorCombo_SelectedIndexChanged);
+ lineStyleEditor.colorCombo.CurrentColorChanged += new EventHandler(colorCombo_CurrentValueChanged);
lineStyleEditor.fillCombo.SelectedIndexChanged += new EventHandler(fillCombo_SelectedIndexChanged);
}
@@ -134,10 +134,10 @@
if (st != null)
{
- sizeUnitsCombo.SelectedValue = st.Unit.ToString();
+ sizeUnitsCombo.SelectedValue = st.Unit.ToString();
//sizeContextCombo.SelectedValue = st.??;
if (st.ColorAsHTML == null)
- lineStyleEditor.colorCombo.CurrentColor = Color.White;
+ lineStyleEditor.colorCombo.CurrentColor = Color.Black;
else
lineStyleEditor.colorCombo.CurrentColor = st.Color;
@@ -208,8 +208,6 @@
this.AdvancedPanel = new System.Windows.Forms.Panel();
this.compositePanel = new System.Windows.Forms.Panel();
this.propertyPanel = new System.Windows.Forms.Panel();
- this.previewGroup = new System.Windows.Forms.GroupBox();
- this.previewPicture = new System.Windows.Forms.PictureBox();
this.lineGroup = new System.Windows.Forms.GroupBox();
this.lineStyleEditor = new OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.LineStyleEditor();
this.sizeGroup = new System.Windows.Forms.GroupBox();
@@ -223,18 +221,20 @@
this.dataColumn4 = new System.Data.DataColumn();
this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
+ this.previewGroup = new System.Windows.Forms.GroupBox();
+ this.previewPicture = new System.Windows.Forms.PictureBox();
this.ComboBoxDataSet = new System.Data.DataSet();
this.CompositeGroup.SuspendLayout();
this.toolStrip1.SuspendLayout();
this.AdvancedPanel.SuspendLayout();
this.compositePanel.SuspendLayout();
this.propertyPanel.SuspendLayout();
- this.previewGroup.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.previewPicture)).BeginInit();
this.lineGroup.SuspendLayout();
this.sizeGroup.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.UnitsTable)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.SizeContextTable)).BeginInit();
+ this.previewGroup.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.previewPicture)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.ComboBoxDataSet)).BeginInit();
this.SuspendLayout();
//
@@ -261,7 +261,6 @@
resources.ApplyResources(this.CompositeGroup, "CompositeGroup");
this.CompositeGroup.Name = "CompositeGroup";
this.CompositeGroup.TabStop = false;
- this.CompositeGroup.Enter += new System.EventHandler(this.CompositeGroup_Enter);
//
// toolStrip1
//
@@ -310,28 +309,11 @@
//
// propertyPanel
//
- this.propertyPanel.Controls.Add(this.previewGroup);
this.propertyPanel.Controls.Add(this.lineGroup);
this.propertyPanel.Controls.Add(this.sizeGroup);
resources.ApplyResources(this.propertyPanel, "propertyPanel");
this.propertyPanel.Name = "propertyPanel";
//
- // previewGroup
- //
- this.previewGroup.Controls.Add(this.previewPicture);
- resources.ApplyResources(this.previewGroup, "previewGroup");
- this.previewGroup.Name = "previewGroup";
- this.previewGroup.TabStop = false;
- //
- // previewPicture
- //
- resources.ApplyResources(this.previewPicture, "previewPicture");
- this.previewPicture.BackColor = System.Drawing.Color.White;
- this.previewPicture.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.previewPicture.Name = "previewPicture";
- this.previewPicture.TabStop = false;
- this.previewPicture.Paint += new System.Windows.Forms.PaintEventHandler(this.previewPicture_Paint);
- //
// lineGroup
//
this.lineGroup.Controls.Add(this.lineStyleEditor);
@@ -418,6 +400,22 @@
resources.ApplyResources(this.label2, "label2");
this.label2.Name = "label2";
//
+ // previewGroup
+ //
+ this.previewGroup.Controls.Add(this.previewPicture);
+ resources.ApplyResources(this.previewGroup, "previewGroup");
+ this.previewGroup.Name = "previewGroup";
+ this.previewGroup.TabStop = false;
+ //
+ // previewPicture
+ //
+ resources.ApplyResources(this.previewPicture, "previewPicture");
+ this.previewPicture.BackColor = System.Drawing.Color.White;
+ this.previewPicture.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.previewPicture.Name = "previewPicture";
+ this.previewPicture.TabStop = false;
+ this.previewPicture.Paint += new System.Windows.Forms.PaintEventHandler(this.previewPicture_Paint);
+ //
// ComboBoxDataSet
//
this.ComboBoxDataSet.DataSetName = "ComboBoxDataSet";
@@ -429,6 +427,7 @@
// LineFeatureStyleEditor
//
resources.ApplyResources(this, "$this");
+ this.Controls.Add(this.previewGroup);
this.Controls.Add(this.propertyPanel);
this.Controls.Add(this.compositePanel);
this.Controls.Add(this.AdvancedPanel);
@@ -440,12 +439,12 @@
this.AdvancedPanel.ResumeLayout(false);
this.compositePanel.ResumeLayout(false);
this.propertyPanel.ResumeLayout(false);
- this.previewGroup.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.previewPicture)).EndInit();
this.lineGroup.ResumeLayout(false);
this.sizeGroup.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.UnitsTable)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.SizeContextTable)).EndInit();
+ this.previewGroup.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.previewPicture)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.ComboBoxDataSet)).EndInit();
this.ResumeLayout(false);
@@ -500,7 +499,7 @@
Changed(this, new EventArgs());
}
- private void colorCombo_SelectedIndexChanged(object sender, EventArgs e)
+ private void colorCombo_CurrentValueChanged(object sender, EventArgs e)
{
if (isUpdating || this.CurrentStrokeType == null)
return;
@@ -578,14 +577,15 @@
private void lineStyles_DrawItem(object sender, System.Windows.Forms.DrawItemEventArgs e)
{
e.DrawBackground();
- if (e.Index >= 0 && e.Index < lineStyles.Items.Count)
+ if ((e.State & DrawItemState.Focus) != 0)
+ e.DrawFocusRectangle();
+
+ if (e.Index >= 0 && e.Index < lineStyles.Items.Count)
{
OSGeo.MapGuide.MaestroAPI.StrokeTypeCollection col = new OSGeo.MapGuide.MaestroAPI.StrokeTypeCollection();
col.Add((OSGeo.MapGuide.MaestroAPI.StrokeType) lineStyles.Items[e.Index]);
- FeaturePreviewRender.RenderPreviewLine(e.Graphics, new Rectangle(1, 1, e.Bounds.Width - 2, e.Bounds.Height - 2), col);
+ FeaturePreviewRender.RenderPreviewLine(e.Graphics, new Rectangle(e.Bounds.Left + 1, e.Bounds.Top + 1, e.Bounds.Width - 2, e.Bounds.Height - 2), col);
}
- if ((e.State & DrawItemState.Focus) != 0)
- e.DrawFocusRectangle();
}
private void RemoveStyleButton_Click(object sender, EventArgs e)
@@ -615,10 +615,5 @@
AdvancedPanel.Enabled =
false;
}
-
- private void CompositeGroup_Enter(object sender, EventArgs e)
- {
-
- }
}
}
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineFeatureStyleEditor.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineFeatureStyleEditor.resx 2009-12-12 19:27:41 UTC (rev 4427)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineFeatureStyleEditor.resx 2009-12-12 23:01:21 UTC (rev 4428)
@@ -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>161, 17</value>
+ <value>3, 16</value>
</metadata>
<data name="AddStyleButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -226,7 +226,7 @@
<value>3, 16</value>
</data>
<data name="toolStrip1.Size" type="System.Drawing.Size, System.Drawing">
- <value>284, 25</value>
+ <value>291, 25</value>
</data>
<data name="toolStrip1.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -250,7 +250,7 @@
<value>16, 56</value>
</data>
<data name="lineStyles.Size" type="System.Drawing.Size, System.Drawing">
- <value>258, 95</value>
+ <value>265, 95</value>
</data>
<data name="lineStyles.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -274,7 +274,7 @@
<value>0, 0</value>
</data>
<data name="CompositeGroup.Size" type="System.Drawing.Size, System.Drawing">
- <value>290, 160</value>
+ <value>297, 160</value>
</data>
<data name="CompositeGroup.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@@ -301,7 +301,7 @@
<value>0, 0</value>
</data>
<data name="AdvancedPanel.Size" type="System.Drawing.Size, System.Drawing">
- <value>290, 48</value>
+ <value>297, 48</value>
</data>
<data name="AdvancedPanel.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@@ -316,7 +316,7 @@
<value>$this</value>
</data>
<data name=">>AdvancedPanel.ZOrder" xml:space="preserve">
- <value>2</value>
+ <value>3</value>
</data>
<data name="compositePanel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
@@ -325,7 +325,7 @@
<value>0, 48</value>
</data>
<data name="compositePanel.Size" type="System.Drawing.Size, System.Drawing">
- <value>290, 160</value>
+ <value>297, 160</value>
</data>
<data name="compositePanel.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
@@ -340,70 +340,16 @@
<value>$this</value>
</data>
<data name=">>compositePanel.ZOrder" xml:space="preserve">
- <value>1</value>
+ <value>2</value>
</data>
- <data name="previewPicture.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
- <value>Top, Left, Right</value>
+ <data name="lineStyleEditor.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Fill</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>274, 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>
- <data name="previewGroup.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
- <value>Top</value>
- </data>
- <data name="previewGroup.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 192</value>
- </data>
- <data name="previewGroup.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
- <value>3, 12, 3, 3</value>
- </data>
- <data name="previewGroup.Size" type="System.Drawing.Size, System.Drawing">
- <value>290, 48</value>
- </data>
- <data name="previewGroup.TabIndex" type="System.Int32, mscorlib">
- <value>10</value>
- </data>
- <data name="previewGroup.Text" xml:space="preserve">
- <value>Preview</value>
- </data>
- <data name=">>previewGroup.Name" xml:space="preserve">
- <value>previewGroup</value>
- </data>
- <data name=">>previewGroup.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=">>previewGroup.Parent" xml:space="preserve">
- <value>propertyPanel</value>
- </data>
- <data name=">>previewGroup.ZOrder" xml:space="preserve">
- <value>0</value>
- </data>
- <data name="lineStyleEditor.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
- <value>Top, Left, Right</value>
- </data>
<data name="lineStyleEditor.Location" type="System.Drawing.Point, System.Drawing">
- <value>8, 16</value>
+ <value>3, 16</value>
</data>
<data name="lineStyleEditor.Size" type="System.Drawing.Size, System.Drawing">
- <value>274, 88</value>
+ <value>291, 133</value>
</data>
<data name="lineStyleEditor.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -412,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.4347, Culture=neutral, PublicKeyToken=null</value>
+ <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.LineStyleEditor, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4358, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>lineStyleEditor.Parent" xml:space="preserve">
<value>lineGroup</value>
@@ -427,7 +373,7 @@
<value>0, 80</value>
</data>
<data name="lineGroup.Size" type="System.Drawing.Size, System.Drawing">
- <value>290, 112</value>
+ <value>297, 152</value>
</data>
<data name="lineGroup.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -445,7 +391,7 @@
<value>propertyPanel</value>
</data>
<data name=">>lineGroup.ZOrder" xml:space="preserve">
- <value>1</value>
+ <value>0</value>
</data>
<data name="sizeUnitsCombo.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
@@ -454,7 +400,7 @@
<value>120, 44</value>
</data>
<data name="sizeUnitsCombo.Size" type="System.Drawing.Size, System.Drawing">
- <value>162, 21</value>
+ <value>169, 21</value>
</data>
<data name="sizeUnitsCombo.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
@@ -478,7 +424,7 @@
<value>120, 12</value>
</data>
<data name="sizeContextCombo.Size" type="System.Drawing.Size, System.Drawing">
- <value>162, 21</value>
+ <value>169, 21</value>
</data>
<data name="sizeContextCombo.TabIndex" type="System.Int32, mscorlib">
<value>10</value>
@@ -550,7 +496,7 @@
<value>0, 0</value>
</data>
<data name="sizeGroup.Size" type="System.Drawing.Size, System.Drawing">
- <value>290, 80</value>
+ <value>297, 80</value>
</data>
<data name="sizeGroup.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -568,7 +514,7 @@
<value>propertyPanel</value>
</data>
<data name=">>sizeGroup.ZOrder" xml:space="preserve">
- <value>2</value>
+ <value>1</value>
</data>
<data name="propertyPanel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
@@ -577,7 +523,7 @@
<value>0, 208</value>
</data>
<data name="propertyPanel.Size" type="System.Drawing.Size, System.Drawing">
- <value>290, 240</value>
+ <value>297, 232</value>
</data>
<data name="propertyPanel.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@@ -592,8 +538,62 @@
<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>
+ <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>
+ <data name="previewGroup.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Top</value>
+ </data>
+ <data name="previewGroup.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 440</value>
+ </data>
+ <data name="previewGroup.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+ <value>3, 12, 3, 3</value>
+ </data>
+ <data name="previewGroup.Size" type="System.Drawing.Size, System.Drawing">
+ <value>297, 48</value>
+ </data>
+ <data name="previewGroup.TabIndex" type="System.Int32, mscorlib">
+ <value>10</value>
+ </data>
+ <data name="previewGroup.Text" xml:space="preserve">
+ <value>Preview</value>
+ </data>
+ <data name=">>previewGroup.Name" xml:space="preserve">
+ <value>previewGroup</value>
+ </data>
+ <data name=">>previewGroup.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=">>previewGroup.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>previewGroup.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>
</metadata>
@@ -604,10 +604,10 @@
<value>True</value>
</data>
<data name="$this.AutoScrollMinSize" type="System.Drawing.Size, System.Drawing">
- <value>290, 480</value>
+ <value>290, 488</value>
</data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
- <value>256, 418</value>
+ <value>297, 488</value>
</data>
<data name=">>AddStyleButton.Name" xml:space="preserve">
<value>AddStyleButton</value>
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleEditor.cs 2009-12-12 19:27:41 UTC (rev 4427)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleEditor.cs 2009-12-12 23:01:21 UTC (rev 4428)
@@ -32,15 +32,15 @@
/// </summary>
public class LineStyleEditor : System.Windows.Forms.UserControl
{
- public ResourceEditors.GeometryStyleEditors.ImageStylePicker fillCombo;
-
- public ResourceEditors.GeometryStyleEditors.ColorComboBox colorCombo;
+ public ResourceEditors.GeometryStyleEditors.ImageStylePicker fillCombo;
public Label lblColor;
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;
+ public System.Windows.Forms.NumericUpDown thicknessUpDown;
+ private Label label1;
+ public ColorComboWithTransparency colorCombo;
/// <summary>
/// Required designer variable.
@@ -52,9 +52,6 @@
// This call is required by the Windows.Forms Form Designer.
InitializeComponent();
- colorCombo.AllowTransparent = false;
- colorCombo.ResetColors();
-
fillCombo.Items.Clear();
fillCombo.Items.AddRange(FeaturePreviewRender.LineStyles);
}
@@ -82,23 +79,19 @@
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LineStyleEditor));
- this.colorCombo = new OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboBox();
this.fillCombo = new OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ImageStylePicker();
this.lblColor = new System.Windows.Forms.Label();
this.lblThickness = new System.Windows.Forms.Label();
this.lblFill = new System.Windows.Forms.Label();
this.displayLine = new System.Windows.Forms.CheckBox();
this.panel1 = new System.Windows.Forms.Panel();
+ 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();
//
- // colorCombo
- //
- resources.ApplyResources(this.colorCombo, "colorCombo");
- this.colorCombo.Name = "colorCombo";
- //
// fillCombo
//
resources.ApplyResources(this.fillCombo, "fillCombo");
@@ -132,20 +125,32 @@
//
// panel1
//
+ 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);
this.panel1.Controls.Add(this.lblFill);
- this.panel1.Controls.Add(this.colorCombo);
resources.ApplyResources(this.panel1, "panel1");
this.panel1.Name = "panel1";
//
+ // label1
+ //
+ resources.ApplyResources(this.label1, "label1");
+ this.label1.Name = "label1";
+ //
// 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";
+ //
// LineStyleEditor
//
this.Controls.Add(this.panel1);
@@ -166,15 +171,7 @@
private void displayLine_CheckedChanged(object sender, System.EventArgs e)
{
- lblFill.Enabled =
- lblThickness.Enabled =
- lblColor.Enabled =
- fillCombo.Enabled =
- thicknessUpDown.Enabled =
- colorCombo.Enabled =
- displayLine.Checked;
-
-
+ panel1.Enabled = displayLine.Checked;
}
}
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleEditor.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleEditor.resx 2009-12-12 19:27:41 UTC (rev 4427)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/LineStyleEditor.resx 2009-12-12 23:01:21 UTC (rev 4428)
@@ -118,41 +118,17 @@
<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="colorCombo.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <data name="fillCombo.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="colorCombo.Location" type="System.Drawing.Point, System.Drawing">
- <value>120, 64</value>
- </data>
- <data name="colorCombo.Size" type="System.Drawing.Size, System.Drawing">
- <value>312, 21</value>
- </data>
- <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="colorCombo.TabIndex" type="System.Int32, mscorlib">
- <value>11</value>
- </data>
- <data name=">>colorCombo.Name" xml:space="preserve">
- <value>colorCombo</value>
- </data>
- <data name=">>colorCombo.Type" xml:space="preserve">
- <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboBox, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4347, 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>5</value>
- </data>
- <data name="fillCombo.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
- <value>Top, Left, Right</value>
- </data>
<data name="fillCombo.Location" type="System.Drawing.Point, System.Drawing">
<value>120, 0</value>
</data>
<data name="fillCombo.Size" type="System.Drawing.Size, System.Drawing">
<value>312, 21</value>
</data>
+ <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="fillCombo.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
</data>
@@ -160,13 +136,13 @@
<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.4347, Culture=neutral, PublicKeyToken=null</value>
+ <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ImageStylePicker, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4358, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>fillCombo.Parent" xml:space="preserve">
<value>panel1</value>
</data>
<data name=">>fillCombo.ZOrder" xml:space="preserve">
- <value>1</value>
+ <value>3</value>
</data>
<data name="lblColor.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 64</value>
@@ -190,7 +166,7 @@
<value>panel1</value>
</data>
<data name=">>lblColor.ZOrder" xml:space="preserve">
- <value>2</value>
+ <value>4</value>
</data>
<data name="lblThickness.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 32</value>
@@ -214,7 +190,7 @@
<value>panel1</value>
</data>
<data name=">>lblThickness.ZOrder" xml:space="preserve">
- <value>3</value>
+ <value>5</value>
</data>
<data name="lblFill.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 8</value>
@@ -238,7 +214,7 @@
<value>panel1</value>
</data>
<data name=">>lblFill.ZOrder" xml:space="preserve">
- <value>4</value>
+ <value>6</value>
</data>
<data name="displayLine.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
@@ -270,6 +246,57 @@
<data name=">>displayLine.ZOrder" xml:space="preserve">
<value>1</value>
</data>
+ <data name="colorCombo.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Left, Right</value>
+ </data>
+ <data name="colorCombo.Location" type="System.Drawing.Point, System.Drawing">
+ <value>120, 64</value>
+ </data>
+ <data name="colorCombo.Size" type="System.Drawing.Size, System.Drawing">
+ <value>312, 49</value>
+ </data>
+ <data name="colorCombo.TabIndex" type="System.Int32, mscorlib">
+ <value>14</value>
+ </data>
+ <data name=">>colorCombo.Name" xml:space="preserve">
+ <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>
+ </data>
+ <data name=">>colorCombo.Parent" xml:space="preserve">
+ <value>panel1</value>
+ </data>
+ <data name=">>colorCombo.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="label1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 96</value>
+ </data>
+ <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>104, 16</value>
+ </data>
+ <data name="label1.TabIndex" type="System.Int32, mscorlib">
+ <value>13</value>
+ </data>
+ <data name="label1.Text" xml:space="preserve">
+ <value>Transparency</value>
+ </data>
+ <data name=">>label1.Name" xml:space="preserve">
+ <value>label1</value>
+ </data>
+ <data name=">>label1.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=">>label1.Parent" xml:space="preserve">
+ <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>
@@ -292,7 +319,7 @@
<value>panel1</value>
</data>
<data name=">>thicknessUpDown.ZOrder" xml:space="preserve">
- <value>0</value>
+ <value>2</value>
</data>
<data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Top</value>
@@ -301,7 +328,7 @@
<value>0, 16</value>
</data>
<data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
- <value>432, 88</value>
+ <value>432, 120</value>
</data>
<data name="panel1.TabIndex" type="System.Int32, mscorlib">
<value>15</value>
@@ -322,7 +349,7 @@
<value>True</value>
</metadata>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
- <value>432, 104</value>
+ <value>432, 136</value>
</data>
<data name=">>$this.Name" xml:space="preserve">
<value>LineStyleEditor</value>
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/PointFeatureStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/PointFeatureStyleEditor.cs 2009-12-12 19:27:41 UTC (rev 4427)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/PointFeatureStyleEditor.cs 2009-12-12 23:01:21 UTC (rev 4428)
@@ -90,13 +90,14 @@
private CheckBox MaintainAspectRatio;
private ComboBox RotationBox;
private Label label9;
- private FillStyleEditor fillStyleEditor;
- public ColorComboBox colorFontForeground;
+ private FillStyleEditor fillStyleEditor;
private Label lblForeground;
private Panel panel1;
private ToolStrip toolStrip1;
private ToolStripButton FontBoldButton;
private ToolStripButton FontItalicButton;
+ private ColorComboWithTransparency colorFontForeground;
+ private Label label11;
private ToolStripButton FontUnderlineButton;
public event EventHandler Changed;
@@ -119,24 +120,20 @@
using(System.IO.MemoryStream ms = new System.IO.MemoryStream(SharedComboDataSet))
ComboBoxDataSet.ReadXml(ms);
- // fix this by editing "PointStyleComboDataset.xml" to include fonts
fontCombo.Items.Clear();
-
foreach (FontFamily f in new System.Drawing.Text.InstalledFontCollection().Families)
fontCombo.Items.Add(f.Name);
- colorFontForeground.AllowTransparent = false;
- colorFontForeground.ResetColors();
- colorFontForeground.SelectedIndexChanged += new EventHandler(colourFontForeground_SelectedIndexChanged);
+ colorFontForeground.CurrentColorChanged += new EventHandler(colourFontForeground_CurrentColorChanged);
fillStyleEditor.displayFill.CheckedChanged += new EventHandler(displayFill_CheckedChanged);
fillStyleEditor.fillCombo.SelectedIndexChanged += new EventHandler(fillCombo_SelectedIndexChanged);
- fillStyleEditor.foregroundColor.SelectedIndexChanged += new EventHandler(foregroundColor_SelectedIndexChanged);
- fillStyleEditor.backgroundColor.SelectedIndexChanged +=new EventHandler(backgroundColor_SelectedIndexChanged);
+ fillStyleEditor.foregroundColor.CurrentColorChanged += new EventHandler(foregroundColor_CurrentColorChanged);
+ fillStyleEditor.backgroundColor.CurrentColorChanged +=new EventHandler(backgroundColor_CurrentColorChanged);
lineStyleEditor.displayLine.CheckedChanged +=new EventHandler(displayLine_CheckedChanged);
lineStyleEditor.thicknessUpDown.ValueChanged +=new EventHandler(thicknessCombo_SelectedIndexChanged);
- lineStyleEditor.colorCombo.SelectedIndexChanged +=new EventHandler(colorCombo_SelectedIndexChanged);
+ lineStyleEditor.colorCombo.CurrentColorChanged +=new EventHandler(colorCombo_CurrentColorChanged);
lineStyleEditor.fillCombo.SelectedIndexChanged +=new EventHandler(fillCombo_Line_SelectedIndexChanged);
m_item = new OSGeo.MapGuide.MaestroAPI.PointSymbolization2DType();
@@ -326,7 +323,6 @@
this.FontBoldButton = new System.Windows.Forms.ToolStripButton();
this.FontItalicButton = new System.Windows.Forms.ToolStripButton();
this.FontUnderlineButton = new System.Windows.Forms.ToolStripButton();
- this.colorFontForeground = new OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboBox();
this.lblForeground = new System.Windows.Forms.Label();
this.comboBoxCharacter = new System.Windows.Forms.ComboBox();
this.fontCombo = new System.Windows.Forms.ComboBox();
@@ -339,6 +335,8 @@
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();
@@ -587,8 +585,9 @@
// groupBoxFont
//
resources.ApplyResources(this.groupBoxFont, "groupBoxFont");
+ this.groupBoxFont.Controls.Add(this.label11);
+ this.groupBoxFont.Controls.Add(this.colorFontForeground);
this.groupBoxFont.Controls.Add(this.panel1);
- this.groupBoxFont.Controls.Add(this.colorFontForeground);
this.groupBoxFont.Controls.Add(this.lblForeground);
this.groupBoxFont.Controls.Add(this.comboBoxCharacter);
this.groupBoxFont.Controls.Add(this.fontCombo);
@@ -637,12 +636,6 @@
this.FontUnderlineButton.Name = "FontUnderlineButton";
this.FontUnderlineButton.Click += new System.EventHandler(this.FontUnderlineButton_Click);
//
- // colorFontForeground
- //
- resources.ApplyResources(this.colorFontForeground, "colorFontForeground");
- this.colorFontForeground.Name = "colorFontForeground";
- this.colorFontForeground.SelectedIndexChanged += new System.EventHandler(this.colourFontForeground_SelectedIndexChanged);
- //
// lblForeground
//
resources.ApplyResources(this.lblForeground, "lblForeground");
@@ -718,6 +711,17 @@
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");
@@ -741,6 +745,7 @@
((System.ComponentModel.ISupportInitialize)(this.previewPicture)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.ComboBoxDataSet)).EndInit();
this.groupBoxFont.ResumeLayout(false);
+ this.groupBoxFont.PerformLayout();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.toolStrip1.ResumeLayout(false);
@@ -1001,7 +1006,7 @@
Changed(this, new EventArgs());
}
- private void foregroundColor_SelectedIndexChanged(object sender, EventArgs e)
+ private void foregroundColor_CurrentColorChanged(object sender, EventArgs e)
{
if (m_inUpdate)
return;
@@ -1013,7 +1018,7 @@
Changed(this, new EventArgs());
}
- private void backgroundColor_SelectedIndexChanged(object sender, EventArgs e)
+ private void backgroundColor_CurrentColorChanged(object sender, EventArgs e)
{
if (m_inUpdate)
return;
@@ -1038,7 +1043,7 @@
Changed(this, new EventArgs());
}
- private void colorCombo_SelectedIndexChanged(object sender, EventArgs e)
+ private void colorCombo_CurrentColorChanged(object sender, EventArgs e)
{
if (m_inUpdate)
return;
@@ -1062,7 +1067,7 @@
Changed(this, new EventArgs());
}
- private void colourFontForeground_SelectedIndexChanged(object sender, EventArgs e)
+ private void colourFontForeground_CurrentColorChanged(object sender, EventArgs e)
{
if (m_inUpdate)
return;
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/PointFeatureStyleEditor.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/PointFeatureStyleEditor.resx 2009-12-12 19:27:41 UTC (rev 4427)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/GeometryStyleEditors/PointFeatureStyleEditor.resx 2009-12-12 23:01:21 UTC (rev 4428)
@@ -438,14 +438,14 @@
<data name="groupBox2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
- <data name="fillStyleEditor.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
- <value>Top, Left, Right</value>
+ <data name="fillStyleEditor.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Fill</value>
</data>
<data name="fillStyleEditor.Location" type="System.Drawing.Point, System.Drawing">
- <value>8, 16</value>
+ <value>3, 16</value>
</data>
<data name="fillStyleEditor.Size" type="System.Drawing.Size, System.Drawing">
- <value>328, 104</value>
+ <value>338, 149</value>
</data>
<data name="fillStyleEditor.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -454,7 +454,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.4347, Culture=neutral, PublicKeyToken=null</value>
+ <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.FillStyleEditor, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4358, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>fillStyleEditor.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -463,10 +463,10 @@
<value>0</value>
</data>
<data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 416</value>
+ <value>0, 440</value>
</data>
<data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
- <value>344, 128</value>
+ <value>344, 168</value>
</data>
<data name="groupBox2.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -489,14 +489,14 @@
<data name="groupBox3.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
- <data name="lineStyleEditor.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
- <value>Top, Left, Right</value>
+ <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>8, 16</value>
+ <value>3, 16</value>
</data>
<data name="lineStyleEditor.Size" type="System.Drawing.Size, System.Drawing">
- <value>328, 104</value>
+ <value>338, 133</value>
</data>
<data name="lineStyleEditor.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -505,7 +505,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.4347, Culture=neutral, PublicKeyToken=null</value>
+ <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.LineStyleEditor, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4358, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>lineStyleEditor.Parent" xml:space="preserve">
<value>groupBox3</value>
@@ -514,10 +514,10 @@
<value>0</value>
</data>
<data name="groupBox3.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 552</value>
+ <value>0, 616</value>
</data>
<data name="groupBox3.Size" type="System.Drawing.Size, System.Drawing">
- <value>344, 128</value>
+ <value>344, 152</value>
</data>
<data name="groupBox3.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
@@ -565,7 +565,7 @@
<value>0</value>
</data>
<data name="groupBox4.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 688</value>
+ <value>0, 776</value>
</data>
<data name="groupBox4.Size" type="System.Drawing.Size, System.Drawing">
<value>344, 48</value>
@@ -621,8 +621,62 @@
<data name="groupBoxFont.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
+ <data name="label11.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label11.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <data name="label11.Location" type="System.Drawing.Point, System.Drawing">
+ <value>16, 80</value>
+ </data>
+ <data name="label11.Size" type="System.Drawing.Size, System.Drawing">
+ <value>72, 13</value>
+ </data>
+ <data name="label11.TabIndex" type="System.Int32, mscorlib">
+ <value>15</value>
+ </data>
+ <data name="label11.Text" xml:space="preserve">
+ <value>Transparency</value>
+ </data>
+ <data name=">>label11.Name" xml:space="preserve">
+ <value>label11</value>
+ </data>
+ <data name=">>label11.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=">>label11.Parent" xml:space="preserve">
+ <value>groupBoxFont</value>
+ </data>
+ <data name=">>label11.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="colorFontForeground.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Left, Right</value>
+ </data>
+ <data name="colorFontForeground.Location" type="System.Drawing.Point, System.Drawing">
+ <value>96, 56</value>
+ </data>
+ <data name="colorFontForeground.Size" type="System.Drawing.Size, System.Drawing">
+ <value>136, 48</value>
+ </data>
+ <data name="colorFontForeground.TabIndex" type="System.Int32, mscorlib">
+ <value>14</value>
+ </data>
+ <data name=">>colorFontForeground.Name" xml:space="preserve">
+ <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>
+ </data>
+ <data name=">>colorFontForeground.Parent" xml:space="preserve">
+ <value>groupBoxFont</value>
+ </data>
+ <data name=">>colorFontForeground.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>171, 17</value>
+ <value>0, 0</value>
</metadata>
<data name="FontBoldButton.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt, style=Bold</value>
@@ -757,32 +811,8 @@
<value>groupBoxFont</value>
</data>
<data name=">>panel1.ZOrder" xml:space="preserve">
- <value>0</value>
+ <value>2</value>
</data>
- <data name="colorFontForeground.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
- <value>Top, Left, Right</value>
- </data>
- <data name="colorFontForeground.Location" type="System.Drawing.Point, System.Drawing">
- <value>56, 56</value>
- </data>
- <data name="colorFontForeground.Size" type="System.Drawing.Size, System.Drawing">
- <value>176, 21</value>
- </data>
- <data name="colorFontForeground.TabIndex" type="System.Int32, mscorlib">
- <value>12</value>
- </data>
- <data name=">>colorFontForeground.Name" xml:space="preserve">
- <value>colorFontForeground</value>
- </data>
- <data name=">>colorFontForeground.Type" xml:space="preserve">
- <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboBox, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4347, Culture=neutral, PublicKeyToken=null</value>
- </data>
- <data name=">>colorFontForeground.Parent" xml:space="preserve">
- <value>groupBoxFont</value>
- </data>
- <data name=">>colorFontForeground.ZOrder" xml:space="preserve">
- <value>1</value>
- </data>
<data name="lblForeground.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 56</value>
</data>
@@ -805,7 +835,7 @@
<value>groupBoxFont</value>
</data>
<data name=">>lblForeground.ZOrder" xml:space="preserve">
- <value>2</value>
+ <value>3</value>
</data>
<data name="comboBoxCharacter.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Right</value>
@@ -832,16 +862,16 @@
<value>groupBoxFont</value>
</data>
<data name=">>comboBoxCharacter.ZOrder" xml:space="preserve">
- <value>3</value>
+ <value>4</value>
</data>
<data name="fontCombo.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="fontCombo.Location" type="System.Drawing.Point, System.Drawing">
- <value>56, 24</value>
+ <value>96, 24</value>
</data>
<data name="fontCombo.Size" type="System.Drawing.Size, System.Drawing">
- <value>176, 21</value>
+ <value>136, 21</value>
</data>
<data name="fontCombo.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
@@ -856,7 +886,7 @@
<value>groupBoxFont</value>
</data>
<data name=">>fontCombo.ZOrder" xml:space="preserve">
- <value>4</value>
+ <value>5</value>
</data>
<data name="label10.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 32</value>
@@ -880,13 +910,13 @@
<value>groupBoxFont</value>
</data>
<data name=">>label10.ZOrder" xml:space="preserve">
- <value>5</value>
+ <value>6</value>
</data>
<data name="groupBoxFont.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 240</value>
</data>
<data name="groupBoxFont.Size" type="System.Drawing.Size, System.Drawing">
- <value>344, 88</value>
+ <value>344, 112</value>
</data>
<data name="groupBoxFont.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
@@ -1081,7 +1111,7 @@
<value>6</value>
</data>
<data name="groupBoxSymbolLocation.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 336</value>
+ <value>0, 360</value>
</data>
<data name="groupBoxSymbolLocation.Size" type="System.Drawing.Size, System.Drawing">
<value>344, 72</value>
@@ -1111,10 +1141,10 @@
<value>True</value>
</data>
<data name="$this.AutoScrollMinSize" type="System.Drawing.Size, System.Drawing">
- <value>344, 744</value>
+ <value>344, 824</value>
</data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
- <value>344, 744</value>
+ <value>344, 824</value>
</data>
<data name=">>RotationTable.Name" xml:space="preserve">
<value>RotationTable</value>
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/ResourceEditors.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/ResourceEditors.csproj 2009-12-12 19:27:41 UTC (rev 4427)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/ResourceEditors.csproj 2009-12-12 23:01:21 UTC (rev 4428)
@@ -365,6 +365,12 @@
<Compile Include="GeometryStyleEditors\ColorComboBox.cs">
<SubType>Component</SubType>
</Compile>
+ <Compile Include="GeometryStyleEditors\ColorComboWithTransparency.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="GeometryStyleEditors\ColorComboWithTransparency.Designer.cs">
+ <DependentUpon>ColorComboWithTransparency.cs</DependentUpon>
+ </Compile>
<Compile Include="GeometryStyleEditors\CustomCombo.cs">
<SubType>Component</SubType>
</Compile>
@@ -1121,6 +1127,9 @@
<SubType>Designer</SubType>
<DependentUpon>FiniteDisplayScales.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="GeometryStyleEditors\ColorComboWithTransparency.resx">
+ <DependentUpon>ColorComboWithTransparency.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="GeometryStyleEditors\Strings\ColorComboBox.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>ColorComboBox.Designer.cs</LastGenOutput>
Modified: trunk/Tools/Maestro/MaestroAPI/Generated/LayerDefinition-1.2.0.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPI/Generated/LayerDefinition-1.2.0.cs 2009-12-12 19:27:41 UTC (rev 4427)
+++ trunk/Tools/Maestro/MaestroAPI/Generated/LayerDefinition-1.2.0.cs 2009-12-12 23:01:21 UTC (rev 4428)
@@ -2977,7 +2977,7 @@
}
set
{
- this.m_foregroundColor = Utility.SerializeHTMLColor(value, false);
+ this.m_foregroundColor = Utility.SerializeHTMLColor(value, true);
}
}
@@ -2998,7 +2998,7 @@
}
set
{
- this.m_backgroundColor = Utility.SerializeHTMLColor(value, false);
+ this.m_backgroundColor = Utility.SerializeHTMLColor(value, true);
}
}
@@ -3470,7 +3470,7 @@
}
set
{
- this.m_color = Utility.SerializeHTMLColor(value, false);
+ this.m_color = Utility.SerializeHTMLColor(value, true);
}
}
@@ -3791,7 +3791,7 @@
}
set
{
- this.m_foregroundColor = Utility.SerializeHTMLColor(value, false);
+ this.m_foregroundColor = Utility.SerializeHTMLColor(value, true);
}
}
More information about the mapguide-commits
mailing list