[mapguide-commits] r6981 - in trunk/Tools/Maestro: Maestro.Base/Services Maestro.Editors Maestro.Editors/LayerDefinition/Vector/Scales Maestro.Editors/SymbolDefinition OSGeo.MapGuide.MaestroAPI OSGeo.MapGuide.MaestroAPI/ObjectModels OSGeo.MapGuide.MaestroAPI/Properties
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Sep 3 10:53:23 PDT 2012
Author: jng
Date: 2012-09-03 10:53:23 -0700 (Mon, 03 Sep 2012)
New Revision: 6981
Added:
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolPreviewDialog.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolPreviewDialog.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolPreviewDialog.resx
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ExternalStrings.cs
Modified:
trunk/Tools/Maestro/Maestro.Base/Services/ResourcePreviewerFactory.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/CompositeStyleListCtrl.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/CompositeStyleListCtrl.resx
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.resx
trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerInterfaces.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Properties/Resources.Designer.cs
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Properties/Resources.resx
Log:
#1204: Abusing GETLEGENDIMAGE for maximum profit. We now have basic previews for Symbol Definitions!
Modified: trunk/Tools/Maestro/Maestro.Base/Services/ResourcePreviewerFactory.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/ResourcePreviewerFactory.cs 2012-09-03 17:03:15 UTC (rev 6980)
+++ trunk/Tools/Maestro/Maestro.Base/Services/ResourcePreviewerFactory.cs 2012-09-03 17:53:23 UTC (rev 6981)
@@ -25,6 +25,11 @@
using OSGeo.MapGuide.MaestroAPI;
using Maestro.Base.Editor;
using Maestro.Editors;
+using System.Drawing;
+using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using OSGeo.MapGuide.ObjectModels;
+using OSGeo.MapGuide.MaestroAPI.Services;
+using Maestro.Editors.SymbolDefinition;
namespace Maestro.Base.Services
{
@@ -37,8 +42,26 @@
public class DefaultResourcePreviewer : IResourcePreviewer
{
+ abstract class PreviewResult
+ {
+
+ }
+
+ class UrlPreviewResult : PreviewResult
+ {
+ public string Url { get; set; }
+ }
+
+ class ImagePreviewResult : PreviewResult
+ {
+ public Image ImagePreview { get; set; }
+ }
+
public void Preview(IResource res, IEditorService edSvc)
{
+ //TODO: Prompt for symbol parameters if there are any, as these can affect the rendered output
+ //and it is a nice way to test symbol parameters wrt to rendering
+
IServerConnection conn = res.CurrentConnection;
BusyWaitDialog.Run(Properties.Resources.PrgPreparingResourcePreview, () => {
string mapguideRootUrl = (string)conn.GetCustomProperty("BaseUrl");
@@ -48,22 +71,81 @@
edSvc.ResourceService.SaveResourceAs(res, resId);
edSvc.ResourceService.CopyResource(res.ResourceID, resId, true);
var previewCopy = edSvc.ResourceService.GetResource(resId);
-
- //Now feed it to the preview engine
- return new ResourcePreviewEngine(mapguideRootUrl, edSvc).GeneratePreviewUrl(previewCopy);
+
+ if (previewCopy.ResourceType == ResourceTypes.SymbolDefinition && conn.SiteVersion >= new Version(2, 0))
+ {
+ //For Symbol Definition previews, we make a placeholder Layer Definition with the
+ ILayerDefinition layerDef = ObjectFactory.CreateDefaultLayer(conn, LayerType.Vector);
+ IVectorLayerDefinition2 vl = layerDef.SubLayer as IVectorLayerDefinition2;
+ if (vl != null)
+ {
+ //HACK-ish: We are flubbing a completely invalid Layer Definition under normal circumstances,
+ //but one that has the minimum required content model to generate an appropriate GETLEGENDIMAGE preview for
+ vl.FeatureName = "";
+ vl.ResourceId = "";
+ vl.Geometry = "";
+ vl.ToolTip = "";
+ var vsr = vl.GetScaleRangeAt(0) as IVectorScaleRange2;
+ if (vsr != null)
+ {
+ vsr.AreaStyle = null;
+ vsr.LineStyle = null;
+ vsr.PointStyle = null;
+ var cs = layerDef.CreateDefaultCompositeStyle();
+ var cr = cs.GetRuleAt(0);
+ var csym = cr.CompositeSymbolization;
+ var si = csym.CreateSymbolReference(previewCopy.ResourceID);
+ csym.AddSymbolInstance(si);
+ vsr.CompositeStyle = new List<ICompositeTypeStyle>() { cs };
+
+ var ldfId = "Session:" + edSvc.SessionID + "//" + res.ResourceType.ToString() + "Preview" + Guid.NewGuid() + ".LayerDefinition";
+ edSvc.ResourceService.SaveResourceAs(layerDef, ldfId);
+
+ var mappingSvc = (IMappingService)conn.GetService((int)ServiceType.Mapping);
+ var img = mappingSvc.GetLegendImage(42, ldfId, 0, 4, 100, 100, "PNG");
+ return new ImagePreviewResult() { ImagePreview = img };
+ }
+ }
+
+ return null;
+ }
+ else
+ {
+ //Now feed it to the preview engine
+ var url = new ResourcePreviewEngine(mapguideRootUrl, edSvc).GeneratePreviewUrl(previewCopy);
+ return new UrlPreviewResult() { Url = url };
+ }
}, (result) => {
- if (result != null) {
- var url = result.ToString();
+ var urlResult = result as UrlPreviewResult;
+ var imgResult = result as ImagePreviewResult;
+ if (urlResult != null)
+ {
+ var url = urlResult.Url;
var launcher = ServiceRegistry.GetService<UrlLauncherService>();
launcher.OpenUrl(url);
}
+ else if (imgResult != null)
+ {
+ new SymbolPreviewDialog(imgResult.ImagePreview).Show(null);
+ }
});
}
public bool IsPreviewable(IResource res)
{
var rt = res.ResourceType;
- return ResourcePreviewEngine.IsPreviewableType(rt) && res.CurrentConnection.Capabilities.SupportsResourcePreviews;
+ if (res.CurrentConnection.Capabilities.SupportsResourcePreviews)
+ {
+ if (rt == ResourceTypes.SymbolDefinition)
+ {
+ return res.CurrentConnection.SiteVersion >= new Version(2, 0) && Array.IndexOf(res.CurrentConnection.Capabilities.SupportedServices, (int)ServiceType.Mapping) >= 0;
+ }
+ else
+ {
+ return ResourcePreviewEngine.IsPreviewableType(rt);
+ }
+ }
+ return false;
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/CompositeStyleListCtrl.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/CompositeStyleListCtrl.Designer.cs 2012-09-03 17:03:15 UTC (rev 6980)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/CompositeStyleListCtrl.Designer.cs 2012-09-03 17:53:23 UTC (rev 6981)
@@ -34,6 +34,7 @@
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.btnAdd = new System.Windows.Forms.ToolStripButton();
this.btnDelete = new System.Windows.Forms.ToolStripButton();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.SuspendLayout();
this.toolStrip1.SuspendLayout();
@@ -52,6 +53,7 @@
//
// lstStyles
//
+ this.lstStyles.DisplayMember = "DisplayString";
resources.ApplyResources(this.lstStyles, "lstStyles");
this.lstStyles.FormattingEnabled = true;
this.lstStyles.Name = "lstStyles";
@@ -87,6 +89,7 @@
this.Name = "CompositeStyleListCtrl";
this.splitContainer1.Panel1.ResumeLayout(false);
this.splitContainer1.Panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/CompositeStyleListCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/CompositeStyleListCtrl.resx 2012-09-03 17:03:15 UTC (rev 6980)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/CompositeStyleListCtrl.resx 2012-09-03 17:53:23 UTC (rev 6981)
@@ -112,16 +112,16 @@
<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>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.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>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.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" />
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="splitContainer1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="splitContainer1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
@@ -132,9 +132,9 @@
<value>0, 25</value>
</data>
<data name="lstStyles.Size" type="System.Drawing.Size, System.Drawing">
- <value>160, 95</value>
+ <value>160, 105</value>
</data>
- <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="lstStyles.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
@@ -142,7 +142,7 @@
<value>lstStyles</value>
</data>
<data name=">>lstStyles.Type" xml:space="preserve">
- <value>System.Windows.Forms.ListBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>lstStyles.Parent" xml:space="preserve">
<value>splitContainer1.Panel1</value>
@@ -150,7 +150,7 @@
<data name=">>lstStyles.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>0, 0</value>
</metadata>
<data name="btnAdd.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
@@ -196,7 +196,7 @@
<value>toolStrip1</value>
</data>
<data name=">>toolStrip1.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>toolStrip1.Parent" xml:space="preserve">
<value>splitContainer1.Panel1</value>
@@ -208,7 +208,7 @@
<value>splitContainer1.Panel1</value>
</data>
<data name=">>splitContainer1.Panel1.Type" xml:space="preserve">
- <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>splitContainer1.Panel1.Parent" xml:space="preserve">
<value>splitContainer1</value>
@@ -220,7 +220,7 @@
<value>splitContainer1.Panel2</value>
</data>
<data name=">>splitContainer1.Panel2.Type" xml:space="preserve">
- <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>splitContainer1.Panel2.Parent" xml:space="preserve">
<value>splitContainer1</value>
@@ -241,7 +241,7 @@
<value>splitContainer1</value>
</data>
<data name=">>splitContainer1.Type" xml:space="preserve">
- <value>System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>splitContainer1.Parent" xml:space="preserve">
<value>$this</value>
@@ -249,7 +249,7 @@
<data name=">>splitContainer1.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">
+ <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
@@ -262,18 +262,18 @@
<value>btnAdd</value>
</data>
<data name=">>btnAdd.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btnDelete.Name" xml:space="preserve">
<value>btnDelete</value>
</data>
<data name=">>btnDelete.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>$this.Name" xml:space="preserve">
<value>CompositeStyleListCtrl</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>
+ <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.Designer.cs 2012-09-03 17:03:15 UTC (rev 6980)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.Designer.cs 2012-09-03 17:53:23 UTC (rev 6981)
@@ -41,10 +41,16 @@
this.inlineSimpleSymbolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.inlineCompoundSymbolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.btnDelete = new System.Windows.Forms.ToolStripButton();
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.symPreview = new System.Windows.Forms.PictureBox();
+ this.btnRefresh = new System.Windows.Forms.Button();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.SuspendLayout();
this.groupBox1.SuspendLayout();
this.toolStrip1.SuspendLayout();
+ this.groupBox2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.symPreview)).BeginInit();
this.SuspendLayout();
//
// btnClose
@@ -63,6 +69,7 @@
// splitContainer1.Panel1
//
this.splitContainer1.Panel1.Controls.Add(this.groupBox1);
+ this.splitContainer1.Panel1.Controls.Add(this.groupBox2);
//
// groupBox1
//
@@ -135,20 +142,45 @@
this.btnDelete.Name = "btnDelete";
this.btnDelete.Click += new System.EventHandler(this.btnDelete_Click);
//
+ // groupBox2
+ //
+ this.groupBox2.Controls.Add(this.symPreview);
+ resources.ApplyResources(this.groupBox2, "groupBox2");
+ this.groupBox2.Name = "groupBox2";
+ this.groupBox2.TabStop = false;
+ //
+ // symPreview
+ //
+ resources.ApplyResources(this.symPreview, "symPreview");
+ this.symPreview.Name = "symPreview";
+ this.symPreview.TabStop = false;
+ this.symPreview.Paint += new System.Windows.Forms.PaintEventHandler(this.previewPicture_Paint);
+ //
+ // btnRefresh
+ //
+ resources.ApplyResources(this.btnRefresh, "btnRefresh");
+ this.btnRefresh.Name = "btnRefresh";
+ this.btnRefresh.UseVisualStyleBackColor = true;
+ this.btnRefresh.Click += new System.EventHandler(this.btnRefresh_Click);
+ //
// SymbolInstancesDialog
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
resources.ApplyResources(this, "$this");
this.ControlBox = false;
+ this.Controls.Add(this.btnRefresh);
this.Controls.Add(this.splitContainer1);
this.Controls.Add(this.btnClose);
this.Name = "SymbolInstancesDialog";
this.splitContainer1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
+ this.groupBox2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.symPreview)).EndInit();
this.ResumeLayout(false);
}
@@ -166,5 +198,8 @@
private System.Windows.Forms.ToolStripMenuItem inlineCompoundSymbolToolStripMenuItem;
private System.Windows.Forms.ToolStripButton btnDelete;
private System.Windows.Forms.ImageList imageList1;
+ private System.Windows.Forms.GroupBox groupBox2;
+ private System.Windows.Forms.PictureBox symPreview;
+ private System.Windows.Forms.Button btnRefresh;
}
}
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs 2012-09-03 17:03:15 UTC (rev 6980)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs 2012-09-03 17:53:23 UTC (rev 6981)
@@ -33,6 +33,7 @@
using OSGeo.MapGuide.MaestroAPI.Schema;
using OSGeo.MapGuide.ObjectModels;
using OSGeo.MapGuide.MaestroAPI.Services;
+using Maestro.Shared.UI;
namespace Maestro.Editors.LayerDefinition.Vector.Scales
{
@@ -69,11 +70,44 @@
AddInstance(inst, false);
}
+ protected override void OnLoad(EventArgs e)
+ {
+ base.OnLoad(e);
+ UpdatePreviewImage();
+ }
+
public bool UseLayerIconPreview
{
get { return _mappingSvc != null && _preview != null; }
}
+ private void UpdatePreviewImage()
+ {
+ using (new WaitCursor(this))
+ {
+ _edSvc.SyncSessionCopy();
+ _previewImg = _mappingSvc.GetLegendImage(_preview.Scale, _preview.LayerDefinition, _preview.ThemeCategory, 4, symPreview.Width, symPreview.Height, _preview.ImageFormat);
+ symPreview.Invalidate();
+ }
+ }
+
+ private Image _previewImg = null;
+
+ private void previewPicture_Paint(object sender, System.Windows.Forms.PaintEventArgs e)
+ {
+ if (UseLayerIconPreview)
+ {
+ if (_previewImg != null)
+ {
+ e.Graphics.DrawImage(_previewImg, new Point(0, 0));
+ }
+ }
+ else
+ {
+ e.Graphics.DrawString("Preview\nnot available", Control.DefaultFont, Brushes.Black, new PointF(0, 0));
+ }
+ }
+
private void btnClose_Click(object sender, EventArgs e)
{
this.Close();
@@ -163,5 +197,10 @@
splitContainer1.Panel2.Controls.Add(c);
}
}
+
+ private void btnRefresh_Click(object sender, EventArgs e)
+ {
+ UpdatePreviewImage();
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.resx 2012-09-03 17:03:15 UTC (rev 6980)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.resx 2012-09-03 17:53:23 UTC (rev 6981)
@@ -112,23 +112,23 @@
<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>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.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>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.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" />
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="btnClose.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Right</value>
</data>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
<value>697, 527</value>
</data>
<data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
</data>
- <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="btnClose.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
@@ -139,13 +139,13 @@
<value>btnClose</value>
</data>
<data name=">>btnClose.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btnClose.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name=">>btnClose.ZOrder" xml:space="preserve">
- <value>1</value>
+ <value>2</value>
</data>
<data name="splitContainer1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
@@ -156,15 +156,15 @@
<data name="lstInstances.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
- <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
- AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2
- CAAAAk1TRnQBSQFMAgEBAgEAASABAAEgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ CAAAAk1TRnQBSQFMAgEBAgEAATgBAAE4AQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -209,7 +209,7 @@
<value>3, 41</value>
</data>
<data name="lstInstances.Size" type="System.Drawing.Size, System.Drawing">
- <value>155, 451</value>
+ <value>155, 307</value>
</data>
<data name="lstInstances.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -218,7 +218,7 @@
<value>lstInstances</value>
</data>
<data name=">>lstInstances.Type" xml:space="preserve">
- <value>System.Windows.Forms.ListView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>lstInstances.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -226,9 +226,27 @@
<data name=">>lstInstances.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>3, 16</value>
</metadata>
+ <data name="referenceToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>210, 22</value>
+ </data>
+ <data name="referenceToolStripMenuItem.Text" xml:space="preserve">
+ <value>Reference</value>
+ </data>
+ <data name="inlineSimpleSymbolToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>210, 22</value>
+ </data>
+ <data name="inlineSimpleSymbolToolStripMenuItem.Text" xml:space="preserve">
+ <value>Inline Simple Symbol</value>
+ </data>
+ <data name="inlineCompoundSymbolToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>210, 22</value>
+ </data>
+ <data name="inlineCompoundSymbolToolStripMenuItem.Text" xml:space="preserve">
+ <value>Inline Compound Symbol</value>
+ </data>
<data name="btnAdd.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
@@ -263,7 +281,7 @@
<value>toolStrip1</value>
</data>
<data name=">>toolStrip1.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>toolStrip1.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -278,7 +296,7 @@
<value>0, 0</value>
</data>
<data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
- <value>161, 495</value>
+ <value>161, 351</value>
</data>
<data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -290,7 +308,7 @@
<value>groupBox1</value>
</data>
<data name=">>groupBox1.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>groupBox1.Parent" xml:space="preserve">
<value>splitContainer1.Panel1</value>
@@ -298,11 +316,59 @@
<data name=">>groupBox1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
+ <data name="symPreview.Location" type="System.Drawing.Point, System.Drawing">
+ <value>31, 29</value>
+ </data>
+ <data name="symPreview.Size" type="System.Drawing.Size, System.Drawing">
+ <value>100, 100</value>
+ </data>
+ <data name="symPreview.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name=">>symPreview.Name" xml:space="preserve">
+ <value>symPreview</value>
+ </data>
+ <data name=">>symPreview.Type" xml:space="preserve">
+ <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>symPreview.Parent" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>symPreview.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="groupBox2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+ <value>Bottom</value>
+ </data>
+ <data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing">
+ <value>0, 351</value>
+ </data>
+ <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
+ <value>161, 144</value>
+ </data>
+ <data name="groupBox2.TabIndex" type="System.Int32, mscorlib">
+ <value>1</value>
+ </data>
+ <data name="groupBox2.Text" xml:space="preserve">
+ <value>Preview</value>
+ </data>
+ <data name=">>groupBox2.Name" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>groupBox2.Type" xml:space="preserve">
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>groupBox2.Parent" xml:space="preserve">
+ <value>splitContainer1.Panel1</value>
+ </data>
+ <data name=">>groupBox2.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
<data name=">>splitContainer1.Panel1.Name" xml:space="preserve">
<value>splitContainer1.Panel1</value>
</data>
<data name=">>splitContainer1.Panel1.Type" xml:space="preserve">
- <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>splitContainer1.Panel1.Parent" xml:space="preserve">
<value>splitContainer1</value>
@@ -314,7 +380,7 @@
<value>splitContainer1.Panel2</value>
</data>
<data name=">>splitContainer1.Panel2.Type" xml:space="preserve">
- <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>splitContainer1.Panel2.Parent" xml:space="preserve">
<value>splitContainer1</value>
@@ -335,33 +401,42 @@
<value>splitContainer1</value>
</data>
<data name=">>splitContainer1.Type" xml:space="preserve">
- <value>System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>splitContainer1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name=">>splitContainer1.ZOrder" xml:space="preserve">
- <value>0</value>
+ <value>1</value>
</data>
- <data name="referenceToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>210, 22</value>
+ <data name="btnRefresh.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Bottom, Left</value>
</data>
- <data name="referenceToolStripMenuItem.Text" xml:space="preserve">
- <value>Reference</value>
+ <data name="btnRefresh.Location" type="System.Drawing.Point, System.Drawing">
+ <value>12, 527</value>
</data>
- <data name="inlineSimpleSymbolToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>210, 22</value>
+ <data name="btnRefresh.Size" type="System.Drawing.Size, System.Drawing">
+ <value>102, 23</value>
</data>
- <data name="inlineSimpleSymbolToolStripMenuItem.Text" xml:space="preserve">
- <value>Inline Simple Symbol</value>
+ <data name="btnRefresh.TabIndex" type="System.Int32, mscorlib">
+ <value>2</value>
</data>
- <data name="inlineCompoundSymbolToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>210, 22</value>
+ <data name="btnRefresh.Text" xml:space="preserve">
+ <value>Refresh Preview</value>
</data>
- <data name="inlineCompoundSymbolToolStripMenuItem.Text" xml:space="preserve">
- <value>Inline Compound Symbol</value>
+ <data name=">>btnRefresh.Name" xml:space="preserve">
+ <value>btnRefresh</value>
</data>
- <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <data name=">>btnRefresh.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>btnRefresh.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>btnRefresh.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
@@ -377,42 +452,42 @@
<value>imageList1</value>
</data>
<data name=">>imageList1.Type" xml:space="preserve">
- <value>System.Windows.Forms.ImageList, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ImageList, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btnAdd.Name" xml:space="preserve">
<value>btnAdd</value>
</data>
<data name=">>btnAdd.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>referenceToolStripMenuItem.Name" xml:space="preserve">
<value>referenceToolStripMenuItem</value>
</data>
<data name=">>referenceToolStripMenuItem.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>inlineSimpleSymbolToolStripMenuItem.Name" xml:space="preserve">
<value>inlineSimpleSymbolToolStripMenuItem</value>
</data>
<data name=">>inlineSimpleSymbolToolStripMenuItem.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>inlineCompoundSymbolToolStripMenuItem.Name" xml:space="preserve">
<value>inlineCompoundSymbolToolStripMenuItem</value>
</data>
<data name=">>inlineCompoundSymbolToolStripMenuItem.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btnDelete.Name" xml:space="preserve">
<value>btnDelete</value>
</data>
<data name=">>btnDelete.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>$this.Name" xml:space="preserve">
<value>SymbolInstancesDialog</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj 2012-09-03 17:03:15 UTC (rev 6980)
+++ trunk/Tools/Maestro/Maestro.Editors/Maestro.Editors.csproj 2012-09-03 17:53:23 UTC (rev 6981)
@@ -1146,6 +1146,12 @@
<Compile Include="SymbolDefinition\SymbolParameterEditor.Designer.cs">
<DependentUpon>SymbolParameterEditor.cs</DependentUpon>
</Compile>
+ <Compile Include="SymbolDefinition\SymbolPreviewDialog.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="SymbolDefinition\SymbolPreviewDialog.Designer.cs">
+ <DependentUpon>SymbolPreviewDialog.cs</DependentUpon>
+ </Compile>
<Compile Include="SymbolDefinition\UsageContextsCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -1830,6 +1836,9 @@
<EmbeddedResource Include="SymbolDefinition\SymbolParameterEditor.resx">
<DependentUpon>SymbolParameterEditor.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="SymbolDefinition\SymbolPreviewDialog.resx">
+ <DependentUpon>SymbolPreviewDialog.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="SymbolDefinition\UsageContextsCtrl.resx">
<DependentUpon>UsageContextsCtrl.cs</DependentUpon>
</EmbeddedResource>
Added: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolPreviewDialog.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolPreviewDialog.Designer.cs (rev 0)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolPreviewDialog.Designer.cs 2012-09-03 17:53:23 UTC (rev 6981)
@@ -0,0 +1,58 @@
+namespace Maestro.Editors.SymbolDefinition
+{
+ partial class SymbolPreviewDialog
+ {
+ /// <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 Windows Form 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(SymbolPreviewDialog));
+ this.pictureBox1 = new System.Windows.Forms.PictureBox();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // pictureBox1
+ //
+ resources.ApplyResources(this.pictureBox1, "pictureBox1");
+ this.pictureBox1.Name = "pictureBox1";
+ this.pictureBox1.TabStop = false;
+ //
+ // SymbolPreviewDialog
+ //
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+ resources.ApplyResources(this, "$this");
+ this.Controls.Add(this.pictureBox1);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+ this.Name = "SymbolPreviewDialog";
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.PictureBox pictureBox1;
+ }
+}
\ No newline at end of file
Added: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolPreviewDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolPreviewDialog.cs (rev 0)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolPreviewDialog.cs 2012-09-03 17:53:23 UTC (rev 6981)
@@ -0,0 +1,39 @@
+#region Disclaimer / License
+// Copyright (C) 2012, 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.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace Maestro.Editors.SymbolDefinition
+{
+ public partial class SymbolPreviewDialog : Form
+ {
+ public SymbolPreviewDialog(Image img)
+ {
+ InitializeComponent();
+ pictureBox1.Image = img;
+ }
+ }
+}
Added: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolPreviewDialog.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolPreviewDialog.resx (rev 0)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolPreviewDialog.resx 2012-09-03 17:53:23 UTC (rev 6981)
@@ -0,0 +1,158 @@
+<?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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="pictureBox1.Location" type="System.Drawing.Point, System.Drawing">
+ <value>12, 12</value>
+ </data>
+ <data name="pictureBox1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>100, 100</value>
+ </data>
+ <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="pictureBox1.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name=">>pictureBox1.Name" xml:space="preserve">
+ <value>pictureBox1</value>
+ </data>
+ <data name=">>pictureBox1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>pictureBox1.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>pictureBox1.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+ <value>124, 126</value>
+ </data>
+ <data name="$this.Text" xml:space="preserve">
+ <value>Symbol Preview</value>
+ </data>
+ <data name=">>$this.Name" xml:space="preserve">
+ <value>SymbolPreviewDialog</value>
+ </data>
+ <data name=">>$this.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+</root>
\ No newline at end of file
Added: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ExternalStrings.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ExternalStrings.cs (rev 0)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ExternalStrings.cs 2012-09-03 17:53:23 UTC (rev 6981)
@@ -0,0 +1,40 @@
+#region Disclaimer / License
+// Copyright (C) 2012, 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.Linq;
+using System.Text;
+
+namespace OSGeo.MapGuide.MaestroAPI
+{
+ /// <summary>
+ /// Defines a set of externally accessible localized strings
+ /// </summary>
+ public class ExternalStrings
+ {
+ public static string CompositeStyleDisplayString
+ {
+ get
+ {
+ return Properties.Resources.CompositeStyleDisplayString;
+ }
+ }
+ }
+}
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj 2012-09-03 17:03:15 UTC (rev 6980)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/OSGeo.MapGuide.MaestroAPI.csproj 2012-09-03 17:53:23 UTC (rev 6981)
@@ -232,6 +232,7 @@
<Compile Include="Expression\FdoFunctionNamespace.cs" />
<Compile Include="Expression\MgFunctionNamespace.cs" />
<Compile Include="Expression\NsDoc.cs" />
+ <Compile Include="ExternalStrings.cs" />
<Compile Include="Feature\ClrFdoTypeMap.cs" />
<Compile Include="Feature\FeatureBase.cs" />
<Compile Include="Feature\FeatureReaderBase.cs" />
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerInterfaces.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerInterfaces.cs 2012-09-03 17:03:15 UTC (rev 6980)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerInterfaces.cs 2012-09-03 17:53:23 UTC (rev 6981)
@@ -1749,6 +1749,7 @@
/// </summary>
public interface ICompositeTypeStyle : IVectorStyle, IRuleCollection<ICompositeRule>
{
+ string DisplayString { get; }
/// <summary>
/// Gets the composite rules.
/// </summary>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs 2012-09-03 17:03:15 UTC (rev 6980)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs 2012-09-03 17:53:23 UTC (rev 6981)
@@ -2188,6 +2188,15 @@
#endif
{
[XmlIgnore]
+ string ICompositeTypeStyle.DisplayString
+ {
+ get
+ {
+ return ExternalStrings.CompositeStyleDisplayString;
+ }
+ }
+
+ [XmlIgnore]
IEnumerable<ICompositeRule> ICompositeTypeStyle.CompositeRule
{
get
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Properties/Resources.Designer.cs 2012-09-03 17:03:15 UTC (rev 6980)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Properties/Resources.Designer.cs 2012-09-03 17:53:23 UTC (rev 6981)
@@ -315,6 +315,15 @@
}
/// <summary>
+ /// Looks up a localized string similar to [Composite Style].
+ /// </summary>
+ internal static string CompositeStyleDisplayString {
+ get {
+ return ResourceManager.GetString("CompositeStyleDisplayString", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Copied resource: {0}.
/// </summary>
internal static string CopiedResource {
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Properties/Resources.resx
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Properties/Resources.resx 2012-09-03 17:03:15 UTC (rev 6980)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/Properties/Resources.resx 2012-09-03 17:53:23 UTC (rev 6981)
@@ -2793,4 +2793,7 @@
<data name="FS_PotentialBadJoinPerformance2" xml:space="preserve">
<value>The Extended Feature Class ({0}) does not satisfy the required parameters for optimal Feature Join performance (both sides sortable, on a single property). Join Performance may not be optimal.</value>
</data>
+ <data name="CompositeStyleDisplayString" xml:space="preserve">
+ <value>[Composite Style]</value>
+ </data>
</root>
\ No newline at end of file
More information about the mapguide-commits
mailing list