[mapguide-commits] r6137 - in trunk/Tools/Maestro/Maestro.Editors:
. LayerDefinition/Vector LayerDefinition/Vector/StyleEditors
Properties Resources
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Sep 20 10:21:53 EDT 2011
Author: jng
Date: 2011-09-20 07:21:53 -0700 (Tue, 20 Sep 2011)
New Revision: 6137
Added:
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ColorExpressionField.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ColorExpressionField.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ColorExpressionField.resx
trunk/Tools/Maestro/Maestro.Editors/Resources/color.png
Modified:
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/FeaturePreviewRender.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.resx
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FillStyleEditor.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FillStyleEditor.resx
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineFeatureStyleEditor.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineFeatureStyleEditor.resx
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineStyleEditor.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineStyleEditor.resx
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.cs
trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj
trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx
Log:
#1811: Replace the existing color picker with a new ColorExpressionField control. This control accepts free-text entry with color picker and Expression Editor support. This allows for expressions to be specified as a BackgroundColor or ForegroundColor. The FeaturePreviewRender had to be modified to only render if the color expressions parse out to valid color. Note that this means that previewing styles that use FDO expressions are effectively un-previewable. This is a small price to pay for greater flexibility
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/FeaturePreviewRender.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/FeaturePreviewRender.cs 2011-09-20 12:29:07 UTC (rev 6136)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/FeaturePreviewRender.cs 2011-09-20 14:21:53 UTC (rev 6137)
@@ -77,16 +77,25 @@
//Until the above is resolved, this is a VERY slow way to do it, even with app. 200 pixels
//Unfortunately I don't want "unsafe" code here...
+ Color? bg = null;
+ Color? fg = null;
+ try
+ {
+ bg = Utility.ParseHTMLColor(item.Fill.BackgroundColor);
+ fg = Utility.ParseHTMLColor(item.Fill.ForegroundColor);
+ }
+ catch { }
+
Bitmap bmp = new Bitmap(img.Image);
for (int y = 0; y < bmp.Height; y++)
for (int x = 0; x < bmp.Width; x++)
{
Color c = bmp.GetPixel(x, y);
- if (c.A > 0x7F /*&& c.R == Color.Black.R && c.B == Color.Black.B && c.G == Color.Black.G*/)
- bmp.SetPixel(x, y, Utility.ParseHTMLColor(item.Fill.ForegroundColor));
- else //if (c.R == Color.White.R && c.B == Color.White.B && c.G == Color.White.G)
- bmp.SetPixel(x, y, Utility.ParseHTMLColor(item.Fill.BackgroundColor));
+ if (c.A > 0x7F && fg.HasValue /*&& c.R == Color.Black.R && c.B == Color.Black.B && c.G == Color.Black.G*/)
+ bmp.SetPixel(x, y, fg.Value);
+ else if (bg.HasValue)//if (c.R == Color.White.R && c.B == Color.White.B && c.G == Color.White.G)
+ bmp.SetPixel(x, y, bg.Value);
}
@@ -94,21 +103,38 @@
break;
}
}
-
- if (texture == null)
- b = new SolidBrush(Utility.ParseHTMLColor(item.Fill.BackgroundColor));
+
+ Color? bgColor = null;
+ try
+ {
+ bgColor = Utility.ParseHTMLColor(item.Fill.BackgroundColor);
+ }
+ catch { }
+ if (texture == null && bgColor.HasValue)
+ b = new SolidBrush(bgColor.Value);
else
b = new TextureBrush(texture);
-
- g.FillPolygon(b, points);
- b.Dispose();
+
+ if (b != null)
+ {
+ g.FillPolygon(b, points);
+ b.Dispose();
+ }
}
if (item.Stroke != null && !string.IsNullOrEmpty(item.Stroke.Color))
{
- var c = Utility.ParseHTMLColor(item.Stroke.Color);
- using (Pen p = new Pen(c, /*float.Parse(item.Stroke.Thickness)*/ 1)) //TODO: Calculate appropriate thickness
- g.DrawPolygon(p, points); //TODO: Implement line dash
+ Color? c = null;
+ try
+ {
+ c = Utility.ParseHTMLColor(item.Stroke.Color);
+ }
+ catch { }
+ if (c.HasValue)
+ {
+ using (Pen p = new Pen(c.Value, /*float.Parse(item.Stroke.Thickness)*/ 1)) //TODO: Calculate appropriate thickness
+ g.DrawPolygon(p, points); //TODO: Implement line dash
+ }
}
}
@@ -126,10 +152,20 @@
//TODO: Implement line dash
foreach (IStroke st in item)
{
- using (Pen p = new Pen(string.IsNullOrEmpty(st.Color) ? Color.White : Utility.ParseHTMLColor(st.Color), /*float.Parse(st.Thickness)*/ 1)) //TODO: Calculate appropriate thickness
+ Color? c = null;
+ try
{
- g.DrawLine(p, new Point(size.Left, size.Top + (size.Height / 2)), new Point(size.Right, size.Top + (size.Height / 2)));
+ c = string.IsNullOrEmpty(st.Color) ? Color.White : Utility.ParseHTMLColor(st.Color);
}
+ catch { }
+
+ if (c.HasValue)
+ {
+ using (Pen p = new Pen(c.Value, /*float.Parse(st.Thickness)*/ 1)) //TODO: Calculate appropriate thickness
+ {
+ g.DrawLine(p, new Point(size.Left, size.Top + (size.Height / 2)), new Point(size.Right, size.Top + (size.Height / 2)));
+ }
+ }
}
}
catch
@@ -140,8 +176,8 @@
public static void RenderPreviewFont(Graphics g, Rectangle size, ITextSymbol item)
{
Font font;
- Color foreground;
- Color background;
+ Color? foreground = null;
+ Color? background = null;
string text = "";
BackgroundStyleType bgStyle;
@@ -158,8 +194,12 @@
{
try { font = new Font(item.FontName, 12); }
catch { font = new Font("Arial", 12); }
- foreground = Utility.ParseHTMLColor(item.ForegroundColor);
- background = Utility.ParseHTMLColor(item.BackgroundColor);
+ try
+ {
+ foreground = Utility.ParseHTMLColor(item.ForegroundColor);
+ background = Utility.ParseHTMLColor(item.BackgroundColor);
+ }
+ catch { }
bgStyle = item.BackgroundStyle;
FontStyle fs = FontStyle.Regular;
@@ -183,11 +223,17 @@
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);
+ if (background.HasValue)
+ {
+ using (Pen p = new Pen(background.Value, 1.5f))
+ g.DrawPath(p, pth);
+ }
- using (Brush b = new SolidBrush(foreground))
- g.FillPath(b, pth);
+ if (foreground.HasValue)
+ {
+ using (Brush b = new SolidBrush(foreground.Value))
+ g.FillPath(b, pth);
+ }
}
}
else
@@ -195,19 +241,25 @@
if (bgStyle == 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));
+ if (background.HasValue)
+ {
+ using (Brush b = new SolidBrush(background.Value))
+ 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);
+ if (foreground.HasValue)
+ {
+ using (Brush b = new SolidBrush(foreground.Value))
+ g.DrawString(text, font, b, size);
+ }
}
}
public static void RenderPreviewFontSymbol(Graphics g, Rectangle size, IFontSymbol item)
{
Font font;
- Color foreground;
+ Color? foreground = null;
string text = "";
if (item == null || item.FontName == null)
@@ -220,10 +272,14 @@
try { font = new Font(item.FontName, 12); }
catch { font = new Font("Arial", 12); }
- if (string.IsNullOrEmpty(item.ForegroundColor))
- foreground = Color.Black;
- else
- foreground = Utility.ParseHTMLColor(item.ForegroundColor);
+ try
+ {
+ if (string.IsNullOrEmpty(item.ForegroundColor))
+ foreground = Color.Black;
+ else
+ foreground = Utility.ParseHTMLColor(item.ForegroundColor);
+ }
+ catch { }
FontStyle fs = FontStyle.Regular;
if (item.Bold.HasValue && item.Bold.Value)
@@ -241,8 +297,11 @@
PointF center = new PointF((size.Width - textSize.Width) / 2, (size.Height - textSize.Height) / 2);
- using (Brush b = new SolidBrush(foreground))
- g.DrawString(text, font, b, center);
+ if (foreground.HasValue)
+ {
+ using (Brush b = new SolidBrush(foreground.Value))
+ g.DrawString(text, font, b, center);
+ }
}
public static void RenderPreviewPoint(Graphics g, Rectangle size, IMarkSymbol item)
@@ -310,7 +369,17 @@
if (item.Fill != null)
{
Brush b;
-
+
+ Color? bgColor = null;
+ Color? fgColor = null;
+
+ try
+ {
+ bgColor = Utility.ParseHTMLColor(item.Fill.BackgroundColor);
+ fgColor = Utility.ParseHTMLColor(item.Fill.ForegroundColor);
+ }
+ catch { }
+
Image texture = null;
foreach (ImageStylePicker.NamedImage img in FillImages)
{
@@ -333,10 +402,10 @@
{
Color c = bmp.GetPixel(x, y);
- if (c.R == Color.Black.R && c.B == Color.Black.B && c.G == Color.Black.G)
- bmp.SetPixel(x, y, Utility.ParseHTMLColor(item.Fill.ForegroundColor));
- else if (c.R == Color.White.R && c.B == Color.White.B && c.G == Color.White.G)
- bmp.SetPixel(x, y, Utility.ParseHTMLColor(item.Fill.BackgroundColor));
+ if (c.R == Color.Black.R && c.B == Color.Black.B && c.G == Color.Black.G && fgColor.HasValue)
+ bmp.SetPixel(x, y, fgColor.Value);
+ else if (c.R == Color.White.R && c.B == Color.White.B && c.G == Color.White.G && bgColor.HasValue)
+ bmp.SetPixel(x, y, bgColor.Value);
}
@@ -345,19 +414,32 @@
}
}
- if (texture == null)
- b = new SolidBrush(Utility.ParseHTMLColor(item.Fill.BackgroundColor));
+ if (texture == null && bgColor.HasValue)
+ b = new SolidBrush(bgColor.Value);
else
b = new TextureBrush(texture);
-
- g.FillPolygon(b, points);
- b.Dispose();
+
+ if (b != null)
+ {
+ g.FillPolygon(b, points);
+ b.Dispose();
+ }
}
if (item.Edge != null)
{
- using(Pen p = new Pen(string.IsNullOrEmpty(item.Edge.Color) ? Color.White : Utility.ParseHTMLColor(item.Edge.Color), /* float.Parse(item.Edge.Thickness) */ 1)) //TODO: Calculate appropriate thickness
- g.DrawPolygon(p, points); //TODO: Implement line dash
+ Color? c = null;
+ try
+ {
+ c = string.IsNullOrEmpty(item.Edge.Color) ? Color.White : Utility.ParseHTMLColor(item.Edge.Color);
+ }
+ catch { }
+
+ if (c.HasValue)
+ {
+ using (Pen p = new Pen(c.Value, /* float.Parse(item.Edge.Thickness) */ 1)) //TODO: Calculate appropriate thickness
+ g.DrawPolygon(p, points); //TODO: Implement line dash
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.cs 2011-09-20 12:29:07 UTC (rev 6136)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.cs 2011-09-20 14:21:53 UTC (rev 6137)
@@ -129,8 +129,8 @@
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AreaFeatureStyleEditor));
- this.fillStyleEditor = new FillStyleEditor();
- this.lineStyleEditor = new LineStyleEditor();
+ this.fillStyleEditor = new Maestro.Editors.LayerDefinition.Vector.StyleEditors.FillStyleEditor();
+ this.lineStyleEditor = new Maestro.Editors.LayerDefinition.Vector.StyleEditors.LineStyleEditor();
this.sizeUnitsCombo = new System.Windows.Forms.ComboBox();
this.UnitsTable = new System.Data.DataTable();
this.dataColumn5 = new System.Data.DataColumn();
@@ -159,6 +159,8 @@
//
resources.ApplyResources(this.fillStyleEditor, "fillStyleEditor");
this.fillStyleEditor.Name = "fillStyleEditor";
+ this.fillStyleEditor.ForegroundRequiresExpression += new System.EventHandler(this.fillStyleEditor_ForegroundRequiresExpression);
+ this.fillStyleEditor.BackgroundRequiresExpression += new System.EventHandler(this.fillStyleEditor_BackgroundRequiresExpression);
//
// lineStyleEditor
//
@@ -315,8 +317,8 @@
fillStyleEditor.displayFill.Checked = m_item.Fill != null;
if (m_item.Fill != null)
{
- fillStyleEditor.foregroundColor.CurrentColor = Utility.ParseHTMLColor(m_item.Fill.ForegroundColor);
- fillStyleEditor.backgroundColor.CurrentColor = Utility.ParseHTMLColor(m_item.Fill.BackgroundColor);
+ fillStyleEditor.foregroundColor.ColorExpression = m_item.Fill.ForegroundColor;
+ fillStyleEditor.backgroundColor.ColorExpression = m_item.Fill.BackgroundColor;
fillStyleEditor.fillCombo.SelectedValue = m_item.Fill.FillPattern;
if (fillStyleEditor.fillCombo.SelectedItem == null && fillStyleEditor.fillCombo.Items.Count > 0)
@@ -338,7 +340,7 @@
sizeContextCombo.Enabled = false;
}
if (!string.IsNullOrEmpty(m_item.Stroke.Color))
- lineStyleEditor.colorCombo.CurrentColor = Utility.ParseHTMLColor(m_item.Stroke.Color);
+ lineStyleEditor.colorCombo.ColorExpression = m_item.Stroke.Color;
lineStyleEditor.fillCombo.SelectedIndex = lineStyleEditor.fillCombo.FindString(m_item.Stroke.LineStyle);
lineStyleEditor.thicknessCombo.Text = m_item.Stroke.Thickness;
}
@@ -400,7 +402,7 @@
if (m_inUpdate)
return;
- m_item.Fill.ForegroundColor = Utility.SerializeHTMLColor(fillStyleEditor.foregroundColor.CurrentColor, true);
+ m_item.Fill.ForegroundColor = fillStyleEditor.foregroundColor.ColorExpression;
previewPicture.Refresh();
if (Changed != null)
Changed(this, new EventArgs());
@@ -411,7 +413,7 @@
if (m_inUpdate)
return;
- m_item.Fill.BackgroundColor = Utility.SerializeHTMLColor(fillStyleEditor.backgroundColor.CurrentColor, true);
+ m_item.Fill.BackgroundColor = fillStyleEditor.backgroundColor.ColorExpression;
previewPicture.Refresh();
if (Changed != null)
Changed(this, new EventArgs());
@@ -440,7 +442,7 @@
if (m_inUpdate)
return;
- m_item.Stroke.Color = Utility.SerializeHTMLColor(lineStyleEditor.colorCombo.CurrentColor, true);
+ m_item.Stroke.Color = lineStyleEditor.colorCombo.ColorExpression;
previewPicture.Refresh();
if (Changed != null)
Changed(this, new EventArgs());
@@ -538,5 +540,19 @@
m_item.Stroke.Unit = (LengthUnitType)Enum.Parse(typeof(LengthUnitType), (string)sizeUnitsCombo.SelectedValue);
}
+
+ private void fillStyleEditor_BackgroundRequiresExpression(object sender, EventArgs e)
+ {
+ string expr = m_editor.EditExpression(fillStyleEditor.backgroundColor.ColorExpression, m_schema, m_providername, m_featureSource);
+ if (expr != null)
+ fillStyleEditor.backgroundColor.ColorExpression = expr;
+ }
+
+ private void fillStyleEditor_ForegroundRequiresExpression(object sender, EventArgs e)
+ {
+ string expr = m_editor.EditExpression(fillStyleEditor.foregroundColor.ColorExpression, m_schema, m_providername, m_featureSource);
+ if (expr != null)
+ fillStyleEditor.foregroundColor.ColorExpression = expr;
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.resx 2011-09-20 12:29:07 UTC (rev 6136)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/AreaFeatureStyleEditor.resx 2011-09-20 14:21:53 UTC (rev 6137)
@@ -136,7 +136,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.4480, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.LayerDefinition.Vector.StyleEditors.FillStyleEditor, Maestro.Editors, Version=4.0.0.6128, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>fillStyleEditor.Parent" xml:space="preserve">
<value>groupBox2</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.4480, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.LayerDefinition.Vector.StyleEditors.LineStyleEditor, Maestro.Editors, Version=4.0.0.6128, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>lineStyleEditor.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -321,6 +321,18 @@
<data name="previewGroup.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</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>282, 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>
@@ -357,30 +369,6 @@
<data name=">>previewGroup.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <data name="previewPicture.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
- <value>Top, Left, Right</value>
- </data>
- <data name="previewPicture.Location" type="System.Drawing.Point, System.Drawing">
- <value>8, 16</value>
- </data>
- <data name="previewPicture.Size" type="System.Drawing.Size, System.Drawing">
- <value>282, 24</value>
- </data>
- <data name="previewPicture.TabIndex" type="System.Int32, mscorlib">
- <value>0</value>
- </data>
- <data name=">>previewPicture.Name" xml:space="preserve">
- <value>previewPicture</value>
- </data>
- <data name=">>previewPicture.Type" xml:space="preserve">
- <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>previewPicture.Parent" xml:space="preserve">
- <value>previewGroup</value>
- </data>
- <data name=">>previewPicture.ZOrder" xml:space="preserve">
- <value>0</value>
- </data>
<metadata name="ComboBoxDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
Added: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ColorExpressionField.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ColorExpressionField.Designer.cs (rev 0)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ColorExpressionField.Designer.cs 2011-09-20 14:21:53 UTC (rev 6137)
@@ -0,0 +1,79 @@
+namespace Maestro.Editors.LayerDefinition.Vector.StyleEditors
+{
+ partial class ColorExpressionField
+ {
+ /// <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()
+ {
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ColorExpressionField));
+ this.txtColor = new System.Windows.Forms.TextBox();
+ this.btnExpr = new System.Windows.Forms.Button();
+ this.btnColor = new System.Windows.Forms.Button();
+ this.SuspendLayout();
+ //
+ // txtColor
+ //
+ resources.ApplyResources(this.txtColor, "txtColor");
+ this.txtColor.Name = "txtColor";
+ this.txtColor.TextChanged += new System.EventHandler(this.txtColor_TextChanged);
+ //
+ // btnExpr
+ //
+ resources.ApplyResources(this.btnExpr, "btnExpr");
+ this.btnExpr.Image = global::Maestro.Editors.Properties.Resources.sum;
+ this.btnExpr.Name = "btnExpr";
+ this.btnExpr.UseVisualStyleBackColor = true;
+ this.btnExpr.Click += new System.EventHandler(this.btnExpr_Click);
+ //
+ // btnColor
+ //
+ resources.ApplyResources(this.btnColor, "btnColor");
+ this.btnColor.Image = global::Maestro.Editors.Properties.Resources.color;
+ this.btnColor.Name = "btnColor";
+ this.btnColor.UseVisualStyleBackColor = true;
+ this.btnColor.Click += new System.EventHandler(this.btnColor_Click);
+ //
+ // ColorExpressionField
+ //
+ resources.ApplyResources(this, "$this");
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.btnColor);
+ this.Controls.Add(this.btnExpr);
+ this.Controls.Add(this.txtColor);
+ this.Name = "ColorExpressionField";
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.TextBox txtColor;
+ private System.Windows.Forms.Button btnExpr;
+ private System.Windows.Forms.Button btnColor;
+
+ }
+}
Added: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ColorExpressionField.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ColorExpressionField.cs (rev 0)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ColorExpressionField.cs 2011-09-20 14:21:53 UTC (rev 6137)
@@ -0,0 +1,88 @@
+#region Disclaimer / License
+// Copyright (C) 2011, Jackie Ng
+// http://trac.osgeo.org/mapguide/wiki/maestro, jumpinjackie at gmail.com
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+#endregion
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+using OSGeo.MapGuide.MaestroAPI;
+
+namespace Maestro.Editors.LayerDefinition.Vector.StyleEditors
+{
+ [ToolboxItem(true)]
+ public partial class ColorExpressionField : UserControl
+ {
+ public ColorExpressionField()
+ {
+ InitializeComponent();
+ }
+
+ [DefaultValue("00000000")]
+ public string ColorExpression
+ {
+ get { return txtColor.Text; }
+ set
+ {
+ txtColor.Text = value;
+ }
+ }
+
+ public event EventHandler CurrentColorChanged;
+
+ public event EventHandler RequestExpressionEditor;
+
+ private void btnExpr_Click(object sender, EventArgs e)
+ {
+ var handler = this.RequestExpressionEditor;
+ if (handler != null)
+ handler(this, EventArgs.Empty);
+ }
+
+ private void txtColor_TextChanged(object sender, EventArgs e)
+ {
+ var handler = this.CurrentColorChanged;
+ if (handler != null)
+ handler(this, EventArgs.Empty);
+ }
+
+ private void btnColor_Click(object sender, EventArgs e)
+ {
+ using (var picker = new ColorDialog())
+ {
+ Color? currentColor = null;
+ try
+ {
+ currentColor = Utility.ParseHTMLColor(this.ColorExpression);
+ }
+ catch { }
+
+ if (currentColor.HasValue)
+ picker.Color = currentColor.Value;
+
+ if (picker.ShowDialog() == DialogResult.OK)
+ {
+ this.ColorExpression = Utility.SerializeHTMLColor(picker.Color, true);
+ }
+ }
+ }
+ }
+}
Added: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ColorExpressionField.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ColorExpressionField.resx (rev 0)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/ColorExpressionField.resx 2011-09-20 14:21:53 UTC (rev 6137)
@@ -0,0 +1,216 @@
+<?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>
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="txtColor.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="txtColor.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 0</value>
+ </data>
+ <data name="txtColor.Size" type="System.Drawing.Size, System.Drawing">
+ <value>210, 20</value>
+ </data>
+ <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="txtColor.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name=">>txtColor.Name" xml:space="preserve">
+ <value>txtColor</value>
+ </data>
+ <data name=">>txtColor.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>txtColor.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>txtColor.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
+ <data name="btnExpr.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Right</value>
+ </data>
+ <data name="btnExpr.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <data name="btnExpr.Location" type="System.Drawing.Point, System.Drawing">
+ <value>216, -1</value>
+ </data>
+ <data name="btnExpr.Size" type="System.Drawing.Size, System.Drawing">
+ <value>26, 23</value>
+ </data>
+ <data name="btnExpr.TabIndex" type="System.Int32, mscorlib">
+ <value>2</value>
+ </data>
+ <data name=">>btnExpr.Name" xml:space="preserve">
+ <value>btnExpr</value>
+ </data>
+ <data name=">>btnExpr.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>btnExpr.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>btnExpr.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="btnColor.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Right</value>
+ </data>
+ <data name="btnColor.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <data name="btnColor.Location" type="System.Drawing.Point, System.Drawing">
+ <value>248, -1</value>
+ </data>
+ <data name="btnColor.Size" type="System.Drawing.Size, System.Drawing">
+ <value>26, 23</value>
+ </data>
+ <data name="btnColor.TabIndex" type="System.Int32, mscorlib">
+ <value>3</value>
+ </data>
+ <data name=">>btnColor.Name" xml:space="preserve">
+ <value>btnColor</value>
+ </data>
+ <data name=">>btnColor.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>btnColor.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>btnColor.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.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+ <value>6, 13</value>
+ </data>
+ <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
+ <value>274, 22</value>
+ </data>
+ <data name=">>$this.Name" xml:space="preserve">
+ <value>ColorExpressionField</value>
+ </data>
+ <data name=">>$this.Type" xml:space="preserve">
+ <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FillStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FillStyleEditor.cs 2011-09-20 12:29:07 UTC (rev 6136)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FillStyleEditor.cs 2011-09-20 14:21:53 UTC (rev 6137)
@@ -39,10 +39,8 @@
private System.Windows.Forms.Label lblBackground;
public Label lblForeground;
private System.Windows.Forms.Label lblFill;
- public ColorComboWithTransparency foregroundColor;
- public Label lblForegroundTransparency;
- public ColorComboWithTransparency backgroundColor;
- public Label lblBackgroundTransparency;
+ public ColorExpressionField foregroundColor;
+ public ColorExpressionField backgroundColor;
/// <summary>
/// Required designer variable.
@@ -84,12 +82,10 @@
this.lblBackground = new System.Windows.Forms.Label();
this.lblForeground = new System.Windows.Forms.Label();
this.lblFill = new System.Windows.Forms.Label();
- this.fillCombo = new ImageStylePicker();
+ this.fillCombo = new Maestro.Editors.Common.ImageStylePicker();
this.displayFill = new System.Windows.Forms.CheckBox();
- this.foregroundColor = new ColorComboWithTransparency();
- this.lblForegroundTransparency = new System.Windows.Forms.Label();
- this.backgroundColor = new ColorComboWithTransparency();
- this.lblBackgroundTransparency = new System.Windows.Forms.Label();
+ this.foregroundColor = new Maestro.Editors.LayerDefinition.Vector.StyleEditors.ColorExpressionField();
+ this.backgroundColor = new Maestro.Editors.LayerDefinition.Vector.StyleEditors.ColorExpressionField();
this.SuspendLayout();
//
// lblBackground
@@ -126,30 +122,20 @@
// foregroundColor
//
resources.ApplyResources(this.foregroundColor, "foregroundColor");
- this.foregroundColor.CurrentColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+ this.foregroundColor.ColorExpression = "";
this.foregroundColor.Name = "foregroundColor";
+ this.foregroundColor.RequestExpressionEditor += new System.EventHandler(this.foregroundColor_RequestExpressionEditor);
//
- // 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.ColorExpression = "";
this.backgroundColor.Name = "backgroundColor";
+ this.backgroundColor.RequestExpressionEditor += new System.EventHandler(this.backgroundColor_RequestExpressionEditor);
//
- // 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);
@@ -174,13 +160,28 @@
lblFill.Enabled =
lblForeground.Enabled =
lblBackground.Enabled =
- lblForegroundTransparency.Enabled =
- lblBackgroundTransparency.Enabled =
fillCombo.Enabled =
foregroundColor.Enabled =
backgroundColor.Enabled =
displayFill.Checked;
}
+ public event EventHandler ForegroundRequiresExpression;
+ public event EventHandler BackgroundRequiresExpression;
+
+
+ private void foregroundColor_RequestExpressionEditor(object sender, EventArgs e)
+ {
+ var handler = this.ForegroundRequiresExpression;
+ if (handler != null)
+ handler(this, EventArgs.Empty);
+ }
+
+ private void backgroundColor_RequestExpressionEditor(object sender, EventArgs e)
+ {
+ var handler = this.BackgroundRequiresExpression;
+ if (handler != null)
+ handler(this, EventArgs.Empty);
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FillStyleEditor.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FillStyleEditor.resx 2011-09-20 12:29:07 UTC (rev 6136)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FillStyleEditor.resx 2011-09-20 14:21:53 UTC (rev 6137)
@@ -144,7 +144,7 @@
<value>$this</value>
</data>
<data name=">>lblBackground.ZOrder" xml:space="preserve">
- <value>6</value>
+ <value>4</value>
</data>
<data name="lblForeground.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -171,7 +171,7 @@
<value>$this</value>
</data>
<data name=">>lblForeground.ZOrder" xml:space="preserve">
- <value>7</value>
+ <value>5</value>
</data>
<data name="lblFill.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -198,7 +198,7 @@
<value>$this</value>
</data>
<data name=">>lblFill.ZOrder" xml:space="preserve">
- <value>8</value>
+ <value>6</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">
@@ -217,13 +217,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.4358, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.Common.ImageStylePicker, Maestro.Editors, Version=4.0.0.6128, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>fillCombo.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name=">>fillCombo.ZOrder" xml:space="preserve">
- <value>5</value>
+ <value>3</value>
</data>
<data name="displayFill.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
<value>System</value>
@@ -250,7 +250,7 @@
<value>$this</value>
</data>
<data name=">>displayFill.ZOrder" xml:space="preserve">
- <value>4</value>
+ <value>2</value>
</data>
<data name="foregroundColor.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
@@ -268,44 +268,14 @@
<value>foregroundColor</value>
</data>
<data name=">>foregroundColor.Type" xml:space="preserve">
- <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboWithTransparency, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4358, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.LayerDefinition.Vector.StyleEditors.ColorExpressionField, Maestro.Editors, Version=4.0.0.6128, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>foregroundColor.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name=">>foregroundColor.ZOrder" xml:space="preserve">
- <value>3</value>
+ <value>1</value>
</data>
- <data name="lblForegroundTransparency.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="lblForegroundTransparency.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
- <value>NoControl</value>
- </data>
- <data name="lblForegroundTransparency.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 72</value>
- </data>
- <data name="lblForegroundTransparency.Size" type="System.Drawing.Size, System.Drawing">
- <value>72, 13</value>
- </data>
- <data name="lblForegroundTransparency.TabIndex" type="System.Int32, mscorlib">
- <value>15</value>
- </data>
- <data name="lblForegroundTransparency.Text" xml:space="preserve">
- <value>Transparency</value>
- </data>
- <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=">>lblForegroundTransparency.ZOrder" xml:space="preserve">
- <value>2</value>
- </data>
<data name="backgroundColor.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
@@ -322,42 +292,12 @@
<value>backgroundColor</value>
</data>
<data name=">>backgroundColor.Type" xml:space="preserve">
- <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ColorComboWithTransparency, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4358, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.LayerDefinition.Vector.StyleEditors.ColorExpressionField, Maestro.Editors, Version=4.0.0.6128, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>backgroundColor.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name=">>backgroundColor.ZOrder" xml:space="preserve">
- <value>1</value>
- </data>
- <data name="lblBackgroundTransparency.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="lblBackgroundTransparency.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
- <value>NoControl</value>
- </data>
- <data name="lblBackgroundTransparency.Location" type="System.Drawing.Point, System.Drawing">
- <value>0, 128</value>
- </data>
- <data name="lblBackgroundTransparency.Size" type="System.Drawing.Size, System.Drawing">
- <value>72, 13</value>
- </data>
- <data name="lblBackgroundTransparency.TabIndex" type="System.Int32, mscorlib">
- <value>17</value>
- </data>
- <data name="lblBackgroundTransparency.Text" xml:space="preserve">
- <value>Transparency</value>
- </data>
- <data name=">>lblBackgroundTransparency.Name" xml:space="preserve">
- <value>lblBackgroundTransparency</value>
- </data>
- <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=">>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">
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs 2011-09-20 12:29:07 UTC (rev 6136)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/FontStyleEditor.cs 2011-09-20 14:21:53 UTC (rev 6137)
@@ -96,10 +96,10 @@
internal System.Windows.Forms.Label verticalLabel;
internal System.Windows.Forms.Label horizontalLabel;
private CheckBox DisplayLabel;
- private ColorComboWithTransparency textColor;
+ private ColorExpressionField textColor;
private Label label12;
private Label label11;
- private ColorComboWithTransparency backgroundColor;
+ private ColorExpressionField backgroundColor;
private bool m_inUpdate = false;
public event EventHandler Changed;
@@ -180,8 +180,8 @@
boldCheck.Checked = m_item.Bold == "true";
italicCheck.Checked = m_item.Italic == "true";
underlineCheck.Checked = m_item.Underlined == "true";
- textColor.CurrentColor = Utility.ParseHTMLColor(m_item.ForegroundColor);
- backgroundColor.CurrentColor = Utility.ParseHTMLColor(m_item.BackgroundColor);
+ textColor.ColorExpression = m_item.ForegroundColor;
+ backgroundColor.ColorExpression = m_item.BackgroundColor;
backgroundTypeCombo.SelectedValue = m_item.BackgroundStyle.ToString();
rotationCombo.SelectedIndex = -1;
rotationCombo.Text = m_item.Rotation;
@@ -263,8 +263,8 @@
this.colorGroup = new System.Windows.Forms.GroupBox();
this.label12 = new System.Windows.Forms.Label();
this.label11 = new System.Windows.Forms.Label();
- this.backgroundColor = new ColorComboWithTransparency();
- this.textColor = new ColorComboWithTransparency();
+ this.backgroundColor = new ColorExpressionField();
+ this.textColor = new ColorExpressionField();
this.backgroundTypeCombo = new System.Windows.Forms.ComboBox();
this.BackgroundTypeTable = new System.Data.DataTable();
this.dataColumn9 = new System.Data.DataColumn();
@@ -504,14 +504,14 @@
// backgroundColor
//
resources.ApplyResources(this.backgroundColor, "backgroundColor");
- this.backgroundColor.CurrentColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+ this.backgroundColor.ColorExpression = "00000000";
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.ColorExpression = "00000000";
this.textColor.Name = "textColor";
this.textColor.CurrentColorChanged += new System.EventHandler(this.textColor_SelectedIndexChanged);
//
@@ -828,7 +828,7 @@
{
if (m_inUpdate)
return;
- m_item.ForegroundColor = Utility.SerializeHTMLColor(textColor.CurrentColor, true);
+ m_item.ForegroundColor = textColor.ColorExpression;
previewPicture.Refresh();
if (Changed != null)
@@ -839,7 +839,7 @@
{
if (m_inUpdate)
return;
- m_item.BackgroundColor = Utility.SerializeHTMLColor(backgroundColor.CurrentColor, true);
+ m_item.BackgroundColor = backgroundColor.ColorExpression;
previewPicture.Refresh();
if (Changed != null)
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineFeatureStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineFeatureStyleEditor.cs 2011-09-20 12:29:07 UTC (rev 6136)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineFeatureStyleEditor.cs 2011-09-20 14:21:53 UTC (rev 6137)
@@ -166,9 +166,9 @@
//sizeContextCombo.SelectedValue = st.SizeContext.ToString();
if (st.Color == null)
- lineStyleEditor.colorCombo.CurrentColor = Color.Black;
+ lineStyleEditor.colorCombo.ColorExpression = Utility.SerializeHTMLColor(Color.Black, true);
else
- lineStyleEditor.colorCombo.CurrentColor = Utility.ParseHTMLColor(st.Color);
+ lineStyleEditor.colorCombo.ColorExpression = st.Color;
foreach(object i in lineStyleEditor.fillCombo.Items)
if (i as ImageStylePicker.NamedImage != null && (i as ImageStylePicker.NamedImage).Name == st.LineStyle)
@@ -235,7 +235,7 @@
this.compositePanel = new System.Windows.Forms.Panel();
this.propertyPanel = new System.Windows.Forms.Panel();
this.lineGroup = new System.Windows.Forms.GroupBox();
- this.lineStyleEditor = new LineStyleEditor();
+ this.lineStyleEditor = new Maestro.Editors.LayerDefinition.Vector.StyleEditors.LineStyleEditor();
this.sizeGroup = new System.Windows.Forms.GroupBox();
this.sizeUnitsCombo = new System.Windows.Forms.ComboBox();
this.UnitsTable = new System.Data.DataTable();
@@ -351,6 +351,7 @@
//
resources.ApplyResources(this.lineStyleEditor, "lineStyleEditor");
this.lineStyleEditor.Name = "lineStyleEditor";
+ this.lineStyleEditor.RequiresExpressionEditor += new System.EventHandler(this.lineStyleEditor_RequiresExpressionEditor);
//
// sizeGroup
//
@@ -551,7 +552,7 @@
{
if (m_inUpdate || this.CurrentStrokeType == null)
return;
- this.CurrentStrokeType.Color = Utility.SerializeHTMLColor(lineStyleEditor.colorCombo.CurrentColor, true);
+ this.CurrentStrokeType.Color = lineStyleEditor.colorCombo.ColorExpression;
previewPicture.Refresh();
lineStyles.Refresh();
if (Changed != null)
@@ -685,5 +686,12 @@
m_inUpdate = false;
}
}
+
+ private void lineStyleEditor_RequiresExpressionEditor(object sender, EventArgs e)
+ {
+ string expr = m_editor.EditExpression(lineStyleEditor.ColorExpression, m_schema, m_providername, m_featureSource);
+ if (expr != null)
+ lineStyleEditor.ColorExpression = expr;
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineFeatureStyleEditor.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineFeatureStyleEditor.resx 2011-09-20 12:29:07 UTC (rev 6136)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineFeatureStyleEditor.resx 2011-09-20 14:21:53 UTC (rev 6137)
@@ -358,7 +358,7 @@
<value>lineStyleEditor</value>
</data>
<data name=">>lineStyleEditor.Type" xml:space="preserve">
- <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.LineStyleEditor, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4437, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.LayerDefinition.Vector.StyleEditors.LineStyleEditor, Maestro.Editors, Version=4.0.0.6128, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>lineStyleEditor.Parent" xml:space="preserve">
<value>lineGroup</value>
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineStyleEditor.cs 2011-09-20 12:29:07 UTC (rev 6136)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineStyleEditor.cs 2011-09-20 14:21:53 UTC (rev 6137)
@@ -39,9 +39,9 @@
private System.Windows.Forms.Label lblFill;
public System.Windows.Forms.CheckBox displayLine;
private System.Windows.Forms.Panel panel1;
+ public ComboBox thicknessCombo;
+ public ColorExpressionField colorCombo;
private Label label1;
- public ColorComboWithTransparency colorCombo;
- public ComboBox thicknessCombo;
/// <summary>
/// Required designer variable.
@@ -80,14 +80,14 @@
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LineStyleEditor));
- this.fillCombo = new ImageStylePicker();
+ this.fillCombo = new Maestro.Editors.Common.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.thicknessCombo = new System.Windows.Forms.ComboBox();
- this.colorCombo = new ColorComboWithTransparency();
+ this.colorCombo = new Maestro.Editors.LayerDefinition.Vector.StyleEditors.ColorExpressionField();
this.label1 = new System.Windows.Forms.Label();
this.panel1.SuspendLayout();
this.SuspendLayout();
@@ -146,8 +146,8 @@
// 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";
+ this.colorCombo.RequestExpressionEditor += new System.EventHandler(this.colorCombo_RequestExpressionEditor);
//
// label1
//
@@ -177,5 +177,19 @@
panel1.Enabled = displayLine.Checked;
}
+ public event EventHandler RequiresExpressionEditor;
+
+ private void colorCombo_RequestExpressionEditor(object sender, EventArgs e)
+ {
+ var handler = this.RequiresExpressionEditor;
+ if (handler != null)
+ handler(this, EventArgs.Empty);
+ }
+
+ public string ColorExpression
+ {
+ get { return colorCombo.ColorExpression; }
+ set { colorCombo.ColorExpression = value; }
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineStyleEditor.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineStyleEditor.resx 2011-09-20 12:29:07 UTC (rev 6136)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/LineStyleEditor.resx 2011-09-20 14:21:53 UTC (rev 6137)
@@ -136,7 +136,7 @@
<value>fillCombo</value>
</data>
<data name=">>fillCombo.Type" xml:space="preserve">
- <value>OSGeo.MapGuide.Maestro.ResourceEditors.GeometryStyleEditors.ImageStylePicker, OSGeo.MapGuide.Maestro.ResourceEditors, Version=1.1.0.4437, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.Common.ImageStylePicker, Maestro.Editors, Version=4.0.0.6128, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>fillCombo.Parent" xml:space="preserve">
<value>panel1</value>
@@ -298,7 +298,7 @@
<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.4437, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.LayerDefinition.Vector.StyleEditors.ColorExpressionField, Maestro.Editors, Version=4.0.0.6128, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>colorCombo.Parent" xml:space="preserve">
<value>panel1</value>
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.cs 2011-09-20 12:29:07 UTC (rev 6136)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/StyleEditors/PointFeatureStyleEditor.cs 2011-09-20 14:21:53 UTC (rev 6137)
@@ -237,8 +237,8 @@
fillStyleEditor.displayFill.Checked = t.Fill != null;
if (t.Fill != null)
{
- fillStyleEditor.foregroundColor.CurrentColor = Utility.ParseHTMLColor(t.Fill.ForegroundColor);
- fillStyleEditor.backgroundColor.CurrentColor = Utility.ParseHTMLColor(t.Fill.BackgroundColor);
+ fillStyleEditor.foregroundColor.ColorExpression = t.Fill.ForegroundColor;
+ fillStyleEditor.backgroundColor.ColorExpression = t.Fill.BackgroundColor;
fillStyleEditor.fillCombo.SelectedValue = t.Fill.FillPattern;
if (fillStyleEditor.fillCombo.SelectedItem == null && fillStyleEditor.fillCombo.Items.Count > 0)
fillStyleEditor.fillCombo.SelectedIndex = fillStyleEditor.fillCombo.FindString(t.Fill.FillPattern);
@@ -251,7 +251,7 @@
if (lineStyleEditor.fillCombo.SelectedItem == null && lineStyleEditor.fillCombo.Items.Count > 0)
lineStyleEditor.fillCombo.SelectedIndex = lineStyleEditor.fillCombo.FindString(t.Edge.LineStyle);
- lineStyleEditor.colorCombo.CurrentColor = Utility.ParseHTMLColor(t.Edge.Color);
+ lineStyleEditor.colorCombo.ColorExpression = t.Edge.Color;
lineStyleEditor.thicknessCombo.Text = t.Edge.Thickness;
}
@@ -1235,7 +1235,7 @@
return;
if (m_item.Symbol.Type == PointSymbolType.Mark)
- ((IMarkSymbol)m_item.Symbol).Fill.ForegroundColor = Utility.SerializeHTMLColor(fillStyleEditor.foregroundColor.CurrentColor, true);
+ ((IMarkSymbol)m_item.Symbol).Fill.ForegroundColor = fillStyleEditor.foregroundColor.ColorExpression;
previewPicture.Refresh();
if (Changed != null)
Changed(this, new EventArgs());
@@ -1247,7 +1247,7 @@
return;
if (m_item.Symbol.Type == PointSymbolType.Mark)
- ((IMarkSymbol)m_item.Symbol).Fill.BackgroundColor = Utility.SerializeHTMLColor(fillStyleEditor.backgroundColor.CurrentColor, true);
+ ((IMarkSymbol)m_item.Symbol).Fill.BackgroundColor = fillStyleEditor.backgroundColor.ColorExpression;
previewPicture.Refresh();
if (Changed != null)
Changed(this, new EventArgs());
@@ -1294,7 +1294,7 @@
return;
if (m_item.Symbol.Type == PointSymbolType.Mark)
- ((IMarkSymbol)m_item.Symbol).Edge.Color = Utility.SerializeHTMLColor(lineStyleEditor.colorCombo.CurrentColor, true);
+ ((IMarkSymbol)m_item.Symbol).Edge.Color = lineStyleEditor.colorCombo.ColorExpression;
previewPicture.Refresh();
if (Changed != null)
Changed(this, new EventArgs());
Modified: trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj 2011-09-20 12:29:07 UTC (rev 6136)
+++ trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj 2011-09-20 14:21:53 UTC (rev 6137)
@@ -723,6 +723,12 @@
<Compile Include="LayerDefinition\Vector\StyleEditors\AreaFeatureStyleEditor.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Include="LayerDefinition\Vector\StyleEditors\ColorExpressionField.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="LayerDefinition\Vector\StyleEditors\ColorExpressionField.Designer.cs">
+ <DependentUpon>ColorExpressionField.cs</DependentUpon>
+ </Compile>
<Compile Include="LayerDefinition\Vector\StyleEditors\ElevationDialog.cs">
<SubType>Form</SubType>
</Compile>
@@ -2194,9 +2200,13 @@
<Content Include="OdbcDriverMap.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <None Include="Resources\color.png" />
<EmbeddedResource Include="LayerDefinition\Vector\Scales\CompositeStyleListCtrl.resx">
<DependentUpon>CompositeStyleListCtrl.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="LayerDefinition\Vector\StyleEditors\ColorExpressionField.resx">
+ <DependentUpon>ColorExpressionField.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="MapDefinition\ExtentCalculationDialog.resx">
<DependentUpon>ExtentCalculationDialog.cs</DependentUpon>
</EmbeddedResource>
Modified: trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs 2011-09-20 12:29:07 UTC (rev 6136)
+++ trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs 2011-09-20 14:21:53 UTC (rev 6137)
@@ -246,6 +246,13 @@
}
}
+ internal static System.Drawing.Bitmap color {
+ get {
+ object obj = ResourceManager.GetObject("color", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to "ColorName","NumOfColors","Type","CritVal","ColorNum","ColorLetter","R","G","B","SchemeType"
///"Accent",3,"qual",,1,"A",127,201,127,"Qualitative"
@@ -281,6 +288,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to Color Picker ....
+ /// </summary>
+ internal static string ColorPicker {
+ get {
+ return ResourceManager.GetString("ColorPicker", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to The selected column had no non-null values and cannot be used..
/// </summary>
internal static string ColumnHasNoValidDataError {
Modified: trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx 2011-09-20 12:29:07 UTC (rev 6136)
+++ trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx 2011-09-20 14:21:53 UTC (rev 6137)
@@ -125,9 +125,6 @@
<value>Failed to read {0} color(s) in line {1}</value>
<comment>An error message that is displayed if the expected color count does not match the actual count</comment>
</data>
- <data name="Confirm" xml:space="preserve">
- <value>Confirm</value>
- </data>
<data name="InvokeUrlNoMapDefined" xml:space="preserve">
<value>Cannot get layers. No map definition specified</value>
</data>
@@ -140,18 +137,14 @@
<data name="layer--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="HeaderFileMissing" xml:space="preserve">
- <value>The header file does not exist</value>
- <comment>A message displayed when the user selects a non-existing file</comment>
- </data>
<data name="application--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="globe--pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\globe--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="icon_viewoptions" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_viewoptions.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="property" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\property.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="PropEnumNoValues" xml:space="preserve">
+ <value>Could not find possible values for enumerable property</value>
</data>
<data name="DataReadError" xml:space="preserve">
<value>Unable to read data from the selected column: {0}</value>
@@ -170,6 +163,9 @@
<data name="tick-circle-frame" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\tick-circle-frame.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="ColorPicker" xml:space="preserve">
+ <value>Color Picker ...</value>
+ </data>
<data name="icon_printablepage_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icon_printablepage_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -182,14 +178,17 @@
<data name="icon_refreshmap_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icon_refreshmap_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="folder_horizontal" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\folder-horizontal.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="block" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\block.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="InvalidResourceIdFolder" xml:space="preserve">
<value>Must be valid resource id. Cannot be a folder</value>
</data>
- <data name="ruler1" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\ruler1.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="icon_tasks" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_tasks.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ColHeaderName" xml:space="preserve">
<value>Name</value>
@@ -197,21 +196,27 @@
<data name="SelectSpatialContext" xml:space="preserve">
<value>Select Spatial Context</value>
</data>
- <data name="icon_restorecenter" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\icon_restorecenter.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="ui_splitter_horizontal" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\ui-splitter-horizontal.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="InlineSymbolDefinition" xml:space="preserve">
+ <value>Inline Symbol Definition</value>
+ </data>
+ <data name="SaveResourceFirst" xml:space="preserve">
+ <value>Please save this resource first</value>
+ </data>
<data name="layer" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="gear--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\gear--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="NoWidgetEditorIface" xml:space="preserve">
<value>The specified editor does not implement the required IWidgetEditor interface</value>
</data>
<data name="control" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\control.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="icon_selectradius_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\icon_selectradius_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="icon_restorecenter_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icon_restorecenter_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -232,8 +237,8 @@
<value>New folder</value>
<comment>The default name of a new folder</comment>
</data>
- <data name="icon_invokescript_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\icon_invokescript_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="FsPreview_GeometryPropertyNodeTooltip" xml:space="preserve">
+ <value>Name: {0}{7}Description: {1}{7}Geometry Types: {2}{7}Read Only: {3}{7}Has Elevation: {4}{7}Has Measure: {5}{7}Spatial Context: {6}</value>
</data>
<data name="grid" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\grid.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -241,11 +246,14 @@
<data name="document--minus" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\document--minus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="ScaleRange" xml:space="preserve">
+ <value>Scale Range</value>
+ </data>
<data name="table--arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\table--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="LayerGroupConvertedToBaseLayerGroup" xml:space="preserve">
- <value>Layer Group ({0}) successfully converted to Base Layer Group ({1})</value>
+ <data name="map--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\map--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="server" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\server.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -266,6 +274,9 @@
<data name="LastUpdated" xml:space="preserve">
<value>Last Updated: </value>
</data>
+ <data name="ExtentsTransformationFailed" xml:space="preserve">
+ <value>Could not transform extent of layer {0} to the map definition's coordinate system. Extents ignored</value>
+ </data>
<data name="InvalidResourceId" xml:space="preserve">
<value>Not a valid resource identifier</value>
</data>
@@ -275,33 +286,24 @@
<data name="PromptDeleteWidgetAndReferences" xml:space="preserve">
<value>Delete this widget and all references to it?</value>
</data>
- <data name="icon_selectwithin_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\icon_selectwithin_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="gear" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\gear.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="AggregateQuery" xml:space="preserve">
<value>Aggregate Query</value>
</data>
- <data name="TitleNewFeatureClass" xml:space="preserve">
- <value>New Feature Class</value>
+ <data name="InvalidResourceIdNotSpecifiedType" xml:space="preserve">
+ <value>Invalid Resource Identifier. Not the specified type</value>
</data>
- <data name="FilterPng" xml:space="preserve">
- <value>Portable Network Graphics (*.png)|*.png</value>
- </data>
<data name="icon_zoomin" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icon_zoomin.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ui_menu" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ui-menu.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="layer-shape-curve" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\layer-shape-curve.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="TitleNewFeatureClass" xml:space="preserve">
+ <value>New Feature Class</value>
</data>
- <data name="icon_clearselect" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\icon_clearselect.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="icon_help_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icon_help_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -314,11 +316,14 @@
<data name="SpecifySecondaryFeatureSource" xml:space="preserve">
<value>Please specify the secondary feature source</value>
</data>
+ <data name="globe--arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\globe--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="drive-download" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\drive-download.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="icon_search" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\icon_search.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="icon_null" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_null.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="QualitativeName" xml:space="preserve">
<value>Qualitative</value>
@@ -330,18 +335,9 @@
<data name="sort-number" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sort-number.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="SelectWidget" xml:space="preserve">
- <value>Select widget</value>
+ <data name="DeleteCommand" xml:space="preserve">
+ <value>Delete Command</value>
</data>
- <data name="IncompatibleConnection" xml:space="preserve">
- <value>This connection is not compatible</value>
- </data>
- <data name="icon_selectwithin" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\icon_selectwithin.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="SearchCmdDescription" xml:space="preserve">
- <value>Search Command</value>
- </data>
<data name="sql-join-right" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sql-join-right.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -362,9 +358,6 @@
<data name="ruler" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ruler.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="application-import" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\application-import.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="document-copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\document-copy.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -392,9 +385,19 @@
<data name="ErrorLoadingWmsConfig" xml:space="preserve">
<value>Error loading WMS configuration document: {0}. A default document will be created</value>
</data>
+ <data name="SymbolGraphicsImagePlaceholder" xml:space="preserve">
+ <value><image></value>
+ </data>
<data name="ui-separator" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ui-separator.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="XmlEditorCursorTemplate" xml:space="preserve">
+ <value>Line {0}, Column {1}</value>
+ </data>
+ <data name="InvalidValueError" xml:space="preserve">
+ <value>Invalid value</value>
+ <comment>An error message that is displayed when the entered value is invalid</comment>
+ </data>
<data name="UnitsKb" xml:space="preserve">
<value>KB</value>
</data>
@@ -404,13 +407,12 @@
<data name="icon_panright_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icon_panright_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="NoSchemasInFeatureSource" xml:space="preserve">
+ <value>Feature Source has no schemas</value>
+ </data>
<data name="RdbmsFeatureSource" xml:space="preserve">
<value>RDBMS Feature Source</value>
</data>
- <data name="NoColumnValuesError" xml:space="preserve">
- <value>No values found in selected column</value>
- <comment>A message displayed when the column has no values</comment>
- </data>
<data name="EmptyText" xml:space="preserve">
<value>None</value>
<comment>The text used for rendering examples with no text data</comment>
@@ -418,17 +420,23 @@
<data name="TestConnectionNoErrors" xml:space="preserve">
<value>Provider reported no errors</value>
</data>
- <data name="InvokeScriptCmdDescription" xml:space="preserve">
- <value>Invoke Script Command</value>
+ <data name="globe--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\globe--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="CustomCommandsExported" xml:space="preserve">
<value>Custom commands exported to {0}</value>
</data>
+ <data name="StandardQuery" xml:space="preserve">
+ <value>Standard Query</value>
+ </data>
+ <data name="ExtentsCalculationCompleted" xml:space="preserve">
+ <value>Map extents calculation completed. Click Accept to use the calculated extents.</value>
+ </data>
<data name="FileDownloaded" xml:space="preserve">
<value>File Downloaded to {0}</value>
</data>
- <data name="map--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\map--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="layer-shape-curve" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\layer-shape-curve.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="NoTypesSelected" xml:space="preserve">
<value>You must select at least one type</value>
@@ -444,6 +452,12 @@
<data name="OdbcDriverExcel64" xml:space="preserve">
<value>{Microsoft Excel Driver (*.xls, *.xlsx, *.xlsm, *.xlsb)}</value>
</data>
+ <data name="ParameterOverrideExists" xml:space="preserve">
+ <value>Parameter Override already specified</value>
+ </data>
+ <data name="sql-join" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\sql-join.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="layer--minus" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer--minus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -457,9 +471,6 @@
<value>Unknown types</value>
<comment>The list entry that represents unknown resource types</comment>
</data>
- <data name="gear--pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\gear--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="icon_panright" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icon_panright.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -470,9 +481,15 @@
<data name="icon_home" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icon_home.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="QuestionResetFsOverrideList" xml:space="preserve">
+ <value>Reset Feature Source override list?</value>
+ </data>
<data name="FieldRequired" xml:space="preserve">
<value>This field is required: {0}</value>
</data>
+ <data name="ResourceDoesntExist" xml:space="preserve">
+ <value>Resource doesn't exist</value>
+ </data>
<data name="SelectProperty" xml:space="preserve">
<value>Select Property</value>
</data>
@@ -498,6 +515,9 @@
<data name="icon_pan" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icon_pan.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="icon_search_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_search_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\arrow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -510,9 +530,6 @@
<data name="drive-upload" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\drive-upload.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="document--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\document--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="SpatialContextsFound" xml:space="preserve">
<value>{0} spatial contexts found</value>
</data>
@@ -528,10 +545,16 @@
<data name="FdoConnectionStringComponentNotFound" xml:space="preserve">
<value>The component "{0}" could not be found in the specified FDO connection string</value>
</data>
+ <data name="FindNothing" xml:space="preserve">
+ <value>Could not find specified string or end of document reached</value>
+ </data>
<data name="OutputFileMissing" xml:space="preserve">
<value>You must enter a full path to the output file</value>
<comment>A message that is displayed when the user has not entered an output file</comment>
</data>
+ <data name="ErrorMapExtentCalculationFailed" xml:space="preserve">
+ <value>Could not transform extents of any layer in this Map Definition. You will have to specify the extents manually.</value>
+ </data>
<data name="OdbcCannotInferDriver" xml:space="preserve">
<value>Could not infer ODBC driver from file name: {0}</value>
</data>
@@ -551,6 +574,9 @@
<value>An error occured while validating the output file path: {0}</value>
<comment>A message that is displayed to the user when the output path is invalid</comment>
</data>
+ <data name="FsPreview_DataPropertyNodeTooltip" xml:space="preserve">
+ <value>Name: {0}{8}Description: {1}{8}Data Type: {2}{8}Nullable: {3}{8}Read Only: {4}{8}Length: {5}{8}Precision: {6}{8}Scale: {7}</value>
+ </data>
<data name="arrow-return-180" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\arrow-return-180.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -584,6 +610,9 @@
<data name="CoordinateTransformationFailed" xml:space="preserve">
<value>Failed to transform coordinates: {0}</value>
</data>
+ <data name="cross" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\cross.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="PropertyTooltip" xml:space="preserve">
<value>Property: {0}
Type: {1}</value>
@@ -624,21 +653,21 @@
<data name="icon_panup_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icon_panup_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="icon_selectpolygon" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\icon_selectpolygon.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="InvalidConnection" xml:space="preserve">
<value>This is not a valid connection: {0}</value>
</data>
<data name="folder--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\folder--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="icon_plotdwf_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_plotdwf_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="FsPreview_ClassNodeTooltip" xml:space="preserve">
+ <value>Name: {0}{3}Description: {1}{3}Geometry Property: {2}</value>
+ </data>
<data name="folder--minus" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\folder--minus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="ColorBrewer" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\ColorBrewer.csv;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
- </data>
<data name="ExportNoCustomCommandsSelected" xml:space="preserve">
<value>No custom commands selected. Nothing to export</value>
</data>
@@ -667,11 +696,15 @@
<data name="icon_pandown_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icon_pandown_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="image" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\image.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="TransparentName" xml:space="preserve">
<value>Transparent</value>
</data>
- <data name="FilterDwf" xml:space="preserve">
- <value>Autodesk DWF (*.dwf)|*.dwf</value>
+ <data name="NoColumnValuesError" xml:space="preserve">
+ <value>No values found in selected column</value>
+ <comment>A message displayed when the column has no values</comment>
</data>
<data name="InvalidRecordCountError" xml:space="preserve">
<value>Invalid record count in line {0}</value>
@@ -686,20 +719,19 @@
<data name="cross-script" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cross-script.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="icon_zoomin_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\icon_zoomin_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="ExportNoCommandsSelected" xml:space="preserve">
<value>No commands selected. Nothing to export</value>
</data>
- <data name="FiletypeMGP" xml:space="preserve">
- <value>MapGuide Packages ({0})</value>
- <comment>The text displayed when browsing for MGP files</comment>
+ <data name="LoadProcedureVersionExecutionNotSupported" xml:space="preserve">
+ <value>This connection does not support executing this type of Load Procedure</value>
</data>
<data name="SymbolTypeNotSupported" xml:space="preserve">
<value>Only symbols of type "Mark" and "Font" are currently supported</value>
<comment>A message that is displayed when the user attempts to modify an item with an unsupported type</comment>
</data>
+ <data name="arrow-curve" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\arrow-curve.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="FdoConnectionStatus" xml:space="preserve">
<value>FDO Connection Status: {0}</value>
</data>
@@ -710,14 +742,13 @@
<value>Missing column "{0}"</value>
<comment>An error message that is displayed if the file is missing a required column</comment>
</data>
- <data name="icon_zoomrect" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\icon_zoomrect.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="InvalidColorComponent" xml:space="preserve">
+ <value>Invalid {0} color component {1} in line {2}</value>
+ <comment>An error message that is displayed if a color component is outside the [0-255] range.
+{0} is the color component, eg. R, G or B
+{1} is the value read
+{2} is the line where the error was encountered</comment>
</data>
- <data name="TooMuchDataWarning" xml:space="preserve">
- <value>The selected column contains more than {0} different values.
-The calculated averages only accounts for the first {0} distinct values.</value>
- <comment>A warning message that is displayed if the dataset is too large</comment>
- </data>
<data name="OverwriteDisplayScales" xml:space="preserve">
<value>Overwrite the current display scales?</value>
</data>
@@ -750,11 +781,14 @@
<value>All files ({0})</value>
<comment>The text displayed when browsing for all file types</comment>
</data>
+ <data name="NotSessionBasedId" xml:space="preserve">
+ <value>Resource ID must not be session based</value>
+ </data>
<data name="NoActiveDataFile" xml:space="preserve">
<value>No active resource data file selected</value>
</data>
- <data name="XmlDocIsValid" xml:space="preserve">
- <value>Document is valid</value>
+ <data name="edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\edit.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="SelectFeatureClass" xml:space="preserve">
<value>Select Feature Class</value>
@@ -771,55 +805,55 @@
<data name="arrow-270" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\arrow-270.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="SymbolGraphicsTextPlaceholder" xml:space="preserve">
- <value><text></value>
- </data>
<data name="AlternateNameMissing" xml:space="preserve">
<value>You must enter a alternate name, or remove the checkmark</value>
<comment>A message displayed when the user has not entered an alternate name for a resource</comment>
</data>
- <data name="globe--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\globe--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="arrow-090" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\arrow-090.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="DeleteCommand" xml:space="preserve">
- <value>Delete Command</value>
+ <data name="globe--pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\globe--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="icon_selectwithin_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_selectwithin_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="icon_selectradius" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icon_selectradius.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="application-export" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-export.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="GeometryStyleComboDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\GeometryStyleComboDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ <data name="icon_select_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_select_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="question" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\question.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="TitleError" xml:space="preserve">
<value>Error</value>
</data>
<data name="FindReplaceNothing" xml:space="preserve">
<value>Nothing to replace</value>
</data>
- <data name="icon_plotdwf_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\icon_plotdwf_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="icon_zoomin_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_zoomin_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="icon_copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\icon_copy.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="FilterAll" xml:space="preserve">
+ <value>All File Types (*.*)|*.*</value>
</data>
- <data name="ui_splitter_horizontal" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\ui-splitter-horizontal.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="Confirm" xml:space="preserve">
+ <value>Confirm</value>
</data>
- <data name="folder_horizontal" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\folder-horizontal.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="gear--pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\gear--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icon_ctxarrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icon_ctxarrow.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="EditWatermarkInstance" xml:space="preserve">
- <value>Edit Watermark Instance</value>
+ <data name="ColorBrewer" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\ColorBrewer.csv;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
- <data name="icon_measure" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\icon_measure.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="FilenameValidationError" xml:space="preserve">
<value>Failed to validate the filenames: {0}</value>
<comment>A message displayed when the user enters an invalid filename</comment>
@@ -827,36 +861,43 @@
<data name="table" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\table.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="question" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\question.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="database--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\database--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="FindNothing" xml:space="preserve">
- <value>Could not find specified string or end of document reached</value>
+ <data name="icon_selectpolygon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_selectpolygon.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="icon_pandown" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_pandown.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="icon_selectwithin" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_selectwithin.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="icon_panup" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icon_panup.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="BaseLayerGroup" xml:space="preserve">
<value>Base Layer Group</value>
</data>
- <data name="icon_select" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\icon_select.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="icon_print_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icon_print_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="FilterXml" xml:space="preserve">
<value>XML Files (.xml)|*.xml</value>
</data>
- <data name="edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\edit.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="HeaderFileMissing" xml:space="preserve">
+ <value>The header file does not exist</value>
+ <comment>A message displayed when the user selects a non-existing file</comment>
</data>
- <data name="icon_select_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\icon_select_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="icon_search" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_search.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ConfirmDeleteResourceData" xml:space="preserve">
<value>Are you sure you want to delete this resource data?</value>
</data>
+ <data name="TitleQuestion" xml:space="preserve">
+ <value>Question</value>
+ </data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="MgCooker" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -872,13 +913,16 @@
WFv7wcxM6j8JZ9++bzL/aISV/Ja7mnNYqmY07YouQubg/l1NwG/XLb2y/7oFegAAAABJRU5ErkJggg==
</value>
</data>
- <data name="QuestionResetFsOverrideList" xml:space="preserve">
- <value>Reset Feature Source override list?</value>
+ <data name="icon_restorecenter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_restorecenter.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="SelectPackageFile" xml:space="preserve">
<value>Select the package file to edit</value>
<comment>The title of the dialog that the is used to pick the package file to edit</comment>
</data>
+ <data name="icon_zoomprev" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_zoomprev.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="WarningMapExtentCalculation" xml:space="preserve">
<value>Could not transform extents of one or more layers in this Map Definition. These extents have not been factored into the computed result.</value>
</data>
@@ -889,8 +933,8 @@
<value>Invalid column name</value>
<comment>An error message that is displayed when the column selected does not exist</comment>
</data>
- <data name="SaveResourceFirst" xml:space="preserve">
- <value>Please save this resource first</value>
+ <data name="SearchCmdDescription" xml:space="preserve">
+ <value>Search Command</value>
</data>
<data name="FilterShp" xml:space="preserve">
<value>ESRI Shape File (*.shp)|*.shp</value>
@@ -899,15 +943,12 @@
<value>Add this item to the flyout? Clicking "No" will add it before the flyout</value>
<comment>A question to confirm whether dropping a menu item on a flyout will add it to the flyout or before the flyout</comment>
</data>
- <data name="XmlEditorCursorTemplate" xml:space="preserve">
- <value>Line {0}, Column {1}</value>
+ <data name="LayerGroupConvertedToBaseLayerGroup" xml:space="preserve">
+ <value>Layer Group ({0}) successfully converted to Base Layer Group ({1})</value>
</data>
<data name="FilterSdf" xml:space="preserve">
<value>Autodesk SDF (*.sdf)|*.sdf</value>
</data>
- <data name="icon_zoom" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\icon_zoom.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="SelectFolder" xml:space="preserve">
<value>Select Folder</value>
</data>
@@ -917,10 +958,6 @@
<data name="FsPostgreSql" xml:space="preserve">
<value>PostgreSQL/PostGIS Feature Source</value>
</data>
- <data name="BetweenLabel" xml:space="preserve">
- <value>Between {0} and {1}</value>
- <comment>The label used for all "between" values in the graduated theme set</comment>
- </data>
<data name="OdbcDriverExcel" xml:space="preserve">
<value>{Microsoft Excel Driver (*.xls)}</value>
</data>
@@ -933,14 +970,17 @@
<data name="arrow-circle-135" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\arrow-circle-135.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="document_task" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\document-task.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="WidgetNameExists" xml:space="preserve">
<value>A widget named {0} already exists</value>
</data>
<data name="CustomCommandsImported" xml:space="preserve">
<value>{0} custom commands imported from {1}. The following commands had to be renamed to prevent clashes: {2}</value>
</data>
- <data name="icon_zoom_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\icon_zoom_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="icon_clearselect" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_clearselect.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icon_invokeurl" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icon_invokeurl.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -951,10 +991,6 @@
Returns: {0}</value>
<comment>The tooltip displayed in the text editor when the cursor is over a function name</comment>
</data>
- <data name="TooManyIndiviualValuesError" xml:space="preserve">
- <value>The selected column contains more than {0} different values, and thus cannot be used for theming with individual values</value>
- <comment>An error message that is displayed if the selected column has too many distinct values</comment>
- </data>
<data name="SQLQuery" xml:space="preserve">
<value>SQL Query</value>
</data>
@@ -994,33 +1030,29 @@
<data name="InvokeUrlCmdDescription" xml:space="preserve">
<value>Invoke URL command</value>
</data>
- <data name="icon_pandown" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\icon_pandown.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="EditWatermarkInstance" xml:space="preserve">
+ <value>Edit Watermark Instance</value>
</data>
- <data name="PropEnumNoValues" xml:space="preserve">
- <value>Could not find possible values for enumerable property</value>
+ <data name="icon_zoom_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_zoom_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="CheckGeometryFirst" xml:space="preserve">
<value>Ensure the Geometry box is checked</value>
</data>
- <data name="SelectColumnPlaceholder" xml:space="preserve">
- <value><Select column></value>
- <comment>A placeholder message displayed when the user has not yet selected a column</comment>
- </data>
<data name="ModeNotAllowed" xml:space="preserve">
<value>Mode not allowed: {0}</value>
</data>
<data name="NoScalesToGenerate" xml:space="preserve">
<value>Number of Scales to generate cannot be less than or equal to 0</value>
</data>
- <data name="NoSchemasInFeatureSource" xml:space="preserve">
- <value>Feature Source has no schemas</value>
+ <data name="icon_copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_copy.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="gear--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\gear--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="ruler1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\ruler1.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="icon_zoomnext_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\icon_zoomnext_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="SelectWidget" xml:space="preserve">
+ <value>Select widget</value>
</data>
<data name="TooManyValuesError" xml:space="preserve">
<value>The selected column contains more than {0} different values, and thus cannot be used for theming</value>
@@ -1029,8 +1061,9 @@
<data name="MoreColorsName" xml:space="preserve">
<value>More colors...</value>
</data>
- <data name="icon_null" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\icon_null.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="FiletypeMGP" xml:space="preserve">
+ <value>MapGuide Packages ({0})</value>
+ <comment>The text displayed when browsing for MGP files</comment>
</data>
<data name="icon_panleft_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icon_panleft_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -1044,8 +1077,8 @@
<data name="OdbcNoMarkedFile" xml:space="preserve">
<value>Could not infer ODBC driver. No file specified</value>
</data>
- <data name="icon_zoomprev" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\icon_zoomprev.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="icon_zoom" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_zoom.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="exclamation" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\exclamation.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -1057,25 +1090,31 @@
<value>This resource already exists, continue with save?</value>
<comment>Question similar to the standard response of saving to an exisiting file using the regular save file dialog</comment>
</data>
+ <data name="FontPreviewError" xml:space="preserve">
+ <value>Cannot Preview Font "{0}"</value>
+ <comment>An error message that is displayed when the rendering fails, using the specified font</comment>
+ </data>
<data name="icon_clearselect_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icon_clearselect_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="LoadProcedureVersionExecutionNotSupported" xml:space="preserve">
- <value>This connection does not support executing this type of Load Procedure</value>
+ <data name="icon_measure" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_measure.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="StandardQuery" xml:space="preserve">
- <value>Standard Query</value>
+ <data name="NoTransformationRequired" xml:space="preserve">
+ <value>No transformation required</value>
</data>
- <data name="InvalidColorComponent" xml:space="preserve">
- <value>Invalid {0} color component {1} in line {2}</value>
- <comment>An error message that is displayed if a color component is outside the [0-255] range.
-{0} is the color component, eg. R, G or B
-{1} is the value read
-{2} is the line where the error was encountered</comment>
+ <data name="IncompatibleConnection" xml:space="preserve">
+ <value>This connection is not compatible</value>
</data>
- <data name="globe--arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\globe--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="TooMuchDataWarning" xml:space="preserve">
+ <value>The selected column contains more than {0} different values.
+The calculated averages only accounts for the first {0} distinct values.</value>
+ <comment>A warning message that is displayed if the dataset is too large</comment>
</data>
+ <data name="TooManyIndiviualValuesError" xml:space="preserve">
+ <value>The selected column contains more than {0} different values, and thus cannot be used for theming with individual values</value>
+ <comment>An error message that is displayed if the selected column has too many distinct values</comment>
+ </data>
<data name="OdbcDriverAccess" xml:space="preserve">
<value>{Microsoft Access Driver (*.mdb)}</value>
</data>
@@ -1088,8 +1127,8 @@
<data name="tick" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\tick.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="ErrorMapExtentCalculationFailed" xml:space="preserve">
- <value>Could not transform extents of any layer in this Map Definition. You will have to specify the extents manually.</value>
+ <data name="FilterDwf" xml:space="preserve">
+ <value>Autodesk DWF (*.dwf)|*.dwf</value>
</data>
<data name="document" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\document.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -1100,8 +1139,8 @@
<data name="SpecifyMapForWebLayout" xml:space="preserve">
<value>Specify a map for this web layout</value>
</data>
- <data name="TitleQuestion" xml:space="preserve">
- <value>Question</value>
+ <data name="icon_invokescript_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_invokescript_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="sql-join-inner" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sql-join-inner.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -1117,6 +1156,9 @@
<value>Less than {0}</value>
<comment>The label used for the lowest value in the graduated theme set</comment>
</data>
+ <data name="FsPreview_RasterPropertyNodeTooltip" xml:space="preserve">
+ <value>Name: {0}{6}Description: {1}{6}Nullable: {2}{6}Image X Size: {3}{6}Image Y Size: {4}{6}Spatial Context: {5}</value>
+ </data>
<data name="FsSqlServerSpatial" xml:space="preserve">
<value>SQL Server Spatial Feature Source</value>
</data>
@@ -1129,9 +1171,8 @@
<data name="layers-stack-arrange-back" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layers-stack-arrange-back.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="FontPreviewError" xml:space="preserve">
- <value>Cannot Preview Font "{0}"</value>
- <comment>An error message that is displayed when the rendering fails, using the specified font</comment>
+ <data name="document--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\document--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="WmsLayersUpdated" xml:space="preserve">
<value>WMS layers updated</value>
@@ -1149,51 +1190,52 @@
<value>The folder must start with \"Library://\", do you want the starting folder to become:\n {0} ?</value>
<comment>A message that is displayed when the user has not entered a folder starting with Library://</comment>
</data>
- <data name="FilterAll" xml:space="preserve">
- <value>All File Types (*.*)|*.*</value>
+ <data name="property" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\property.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="document_task" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\document-task.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="SymbolGraphicsTextPlaceholder" xml:space="preserve">
+ <value><text></value>
</data>
<data name="SelectLayerFirst" xml:space="preserve">
<value>Please select the layer first</value>
</data>
- <data name="icon_search_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\icon_search_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="application-import" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\application-import.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="sum" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sum.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="InvalidValueError" xml:space="preserve">
- <value>Invalid value</value>
- <comment>An error message that is displayed when the entered value is invalid</comment>
+ <data name="SelectColumnPlaceholder" xml:space="preserve">
+ <value><Select column></value>
+ <comment>A placeholder message displayed when the user has not yet selected a column</comment>
</data>
- <data name="icon_tasks" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\icon_tasks.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="XmlDocIsValid" xml:space="preserve">
+ <value>Document is valid</value>
</data>
- <data name="InvalidResourceIdNotSpecifiedType" xml:space="preserve">
- <value>Invalid Resource Identifier. Not the specified type</value>
+ <data name="icon_zoomnext_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_zoomnext_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="sql-join" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\sql-join.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="icon_select" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_select.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icon_back" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icon_back.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="database--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\database--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="BetweenLabel" xml:space="preserve">
+ <value>Between {0} and {1}</value>
+ <comment>The label used for all "between" values in the graduated theme set</comment>
</data>
- <data name="arrow-090" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\arrow-090.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="InvokeScriptCmdDescription" xml:space="preserve">
+ <value>Invoke Script Command</value>
</data>
- <data name="cross" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\cross.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="GeometryStyleComboDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\GeometryStyleComboDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
<data name="CommandTypesDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\CommandTypesDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
</data>
- <data name="arrow-curve" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\arrow-curve.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="icon_selectradius_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_selectradius_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="edit-indent" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\edit-indent.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -1202,8 +1244,8 @@
<value>Expression...</value>
<comment>A value displayed in the combobox to activate the expression builder</comment>
</data>
- <data name="icon_viewoptions" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\icon_viewoptions.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="FilterPng" xml:space="preserve">
+ <value>Portable Network Graphics (*.png)|*.png</value>
</data>
<data name="FsMySql" xml:space="preserve">
<value>MySQL Feature Source</value>
@@ -1214,49 +1256,13 @@
<data name="icon_zoomselect_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icon_zoomselect_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="SymbolGraphicsImagePlaceholder" xml:space="preserve">
- <value><image></value>
+ <data name="icon_zoomrect" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\icon_zoomrect.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="FindEmptyString" xml:space="preserve">
<value>Cannot Find an Empty String</value>
</data>
- <data name="image" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\image.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="color" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\color.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="ResourceDoesntExist" xml:space="preserve">
- <value>Resource doesn't exist</value>
- </data>
- <data name="FsPreview_ClassNodeTooltip" xml:space="preserve">
- <value>Name: {0}{3}Description: {1}{3}Geometry Property: {2}</value>
- </data>
- <data name="FsPreview_DataPropertyNodeTooltip" xml:space="preserve">
- <value>Name: {0}{8}Description: {1}{8}Data Type: {2}{8}Nullable: {3}{8}Read Only: {4}{8}Length: {5}{8}Precision: {6}{8}Scale: {7}</value>
- </data>
- <data name="FsPreview_GeometryPropertyNodeTooltip" xml:space="preserve">
- <value>Name: {0}{7}Description: {1}{7}Geometry Types: {2}{7}Read Only: {3}{7}Has Elevation: {4}{7}Has Measure: {5}{7}Spatial Context: {6}</value>
- </data>
- <data name="FsPreview_RasterPropertyNodeTooltip" xml:space="preserve">
- <value>Name: {0}{6}Description: {1}{6}Nullable: {2}{6}Image X Size: {3}{6}Image Y Size: {4}{6}Spatial Context: {5}</value>
- </data>
- <data name="ScaleRange" xml:space="preserve">
- <value>Scale Range</value>
- </data>
- <data name="InlineSymbolDefinition" xml:space="preserve">
- <value>Inline Symbol Definition</value>
- </data>
- <data name="ParameterOverrideExists" xml:space="preserve">
- <value>Parameter Override already specified</value>
- </data>
- <data name="NotSessionBasedId" xml:space="preserve">
- <value>Resource ID must not be session based</value>
- </data>
- <data name="ExtentsCalculationCompleted" xml:space="preserve">
- <value>Map extents calculation completed. Click Accept to use the calculated extents.</value>
- </data>
- <data name="ExtentsTransformationFailed" xml:space="preserve">
- <value>Could not transform extent of layer {0} to the map definition's coordinate system. Extents ignored</value>
- </data>
- <data name="NoTransformationRequired" xml:space="preserve">
- <value>No transformation required</value>
- </data>
</root>
\ No newline at end of file
Added: trunk/Tools/Maestro/Maestro.Editors/Resources/color.png
===================================================================
(Binary files differ)
Property changes on: trunk/Tools/Maestro/Maestro.Editors/Resources/color.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
More information about the mapguide-commits
mailing list