[mapguide-commits] r7172 - in trunk/Tools/Maestro: Maestro.AddIn.Local/Services Maestro.AddIn.Scripting Maestro.AddIn.Scripting/Services Maestro.Base/Editor Maestro.Base/Services Maestro.Base/UI/Preferences Maestro.Editors Maestro.Editors/Fusion Maestro.Editors/SymbolDefinition Maestro.Editors/WebLayout
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Oct 30 21:57:53 PDT 2012
Author: jng
Date: 2012-10-30 21:57:53 -0700 (Tue, 30 Oct 2012)
New Revision: 7172
Modified:
trunk/Tools/Maestro/Maestro.AddIn.Local/Services/LocalPreviewer.cs
trunk/Tools/Maestro/Maestro.AddIn.Scripting/Services/ScriptingClasses.cs
trunk/Tools/Maestro/Maestro.AddIn.Scripting/Strings.Designer.cs
trunk/Tools/Maestro/Maestro.AddIn.Scripting/Strings.resx
trunk/Tools/Maestro/Maestro.Base/Editor/EditorContentBase.cs
trunk/Tools/Maestro/Maestro.Base/Editor/ResourcePreviewEngine.cs
trunk/Tools/Maestro/Maestro.Base/Services/ResourcePreviewerFactory.cs
trunk/Tools/Maestro/Maestro.Base/UI/Preferences/ConfigProperties.cs
trunk/Tools/Maestro/Maestro.Base/UI/Preferences/EditorPreferencesCtrl.Designer.cs
trunk/Tools/Maestro/Maestro.Base/UI/Preferences/EditorPreferencesCtrl.cs
trunk/Tools/Maestro/Maestro.Base/UI/Preferences/EditorPreferencesCtrl.resx
trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexLayoutSettingsCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/IEditorService.cs
trunk/Tools/Maestro/Maestro.Editors/ResourceEditorServiceBase.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolEditorService.cs
trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.resx
Log:
#2121: Add support for generating locale-specific resource previews. This is all driven through a new configuration property available under Tools - Options
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/Services/LocalPreviewer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/Services/LocalPreviewer.cs 2012-10-31 04:02:33 UTC (rev 7171)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Services/LocalPreviewer.cs 2012-10-31 04:57:53 UTC (rev 7172)
@@ -28,6 +28,8 @@
using OSGeo.MapGuide;
using OSGeo.MapGuide.ObjectModels.WatermarkDefinition;
using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using Maestro.Editors;
namespace Maestro.AddIn.Local.Services
{
@@ -41,8 +43,18 @@
rt == ResourceTypes.WatermarkDefinition);
}
- public void Preview(OSGeo.MapGuide.MaestroAPI.Resource.IResource res, Maestro.Editors.IEditorService edSvc)
+ /// <summary>
+ /// Previews the specified resource
+ /// </summary>
+ /// <param name="res">The resource to be previewed</param>
+ /// <param name="edSvc">The editor service</param>
+ public void Preview(IResource res, IEditorService edSvc)
{
+ Preview(res, edSvc, edSvc.PreviewLocale);
+ }
+
+ public void Preview(IResource res, IEditorService edSvc, string locale)
+ {
IMapDefinition mapDef = null;
var conn = res.CurrentConnection;
Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/Services/ScriptingClasses.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/Services/ScriptingClasses.cs 2012-10-31 04:02:33 UTC (rev 7171)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/Services/ScriptingClasses.cs 2012-10-31 04:57:53 UTC (rev 7172)
@@ -33,6 +33,7 @@
using Microsoft.Scripting.Hosting;
using Maestro.AddIn.Scripting.UI;
using Maestro.Editors.Generic;
+using Maestro.Base.Editor;
namespace Maestro.AddIn.Scripting.Services
{
@@ -278,6 +279,46 @@
}
/// <summary>
+ /// Launches a preview of the given open resource
+ /// </summary>
+ /// <param name="conn"></param>
+ /// <param name="resourceId"></param>
+ /// <param name="locale"></param>
+ public void PreviewResource(IServerConnection conn, string resourceId, string locale)
+ {
+ Action action = () =>
+ {
+ var siteExp = this.MainWindow.ActiveSiteExplorer;
+ var omgr = ServiceRegistry.GetService<OpenResourceManager>();
+ IEditorViewContent openEd = null;
+ foreach (var ed in omgr.OpenEditors)
+ {
+ if (ed.Resource.CurrentConnection == conn && ed.EditorService.ResourceID == resourceId)
+ {
+ openEd = ed;
+ break;
+ }
+ }
+ if (openEd != null)
+ {
+ var previewer = ResourcePreviewerFactory.GetPreviewer(conn.ProviderName);
+ if (previewer != null)
+ previewer.Preview(openEd.Resource, openEd.EditorService, locale);
+ else
+ throw new Exception(string.Format(Strings.Error_NoPreviewer, conn.ProviderName));
+ }
+ else
+ {
+ throw new Exception(string.Format(Strings.Error_NoOpenEditor, resourceId));
+ }
+ };
+ if (this.MainWindow.InvokeRequired)
+ this.MainWindow.Invoke(action);
+ else
+ action();
+ }
+
+ /// <summary>
/// Invokes the specified method on the UI thread. Methods that interact with the UI or create UI components
/// must be done on this thread
/// </summary>
Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/Strings.Designer.cs 2012-10-31 04:02:33 UTC (rev 7171)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/Strings.Designer.cs 2012-10-31 04:57:53 UTC (rev 7172)
@@ -61,6 +61,24 @@
}
/// <summary>
+ /// Looks up a localized string similar to No Open Editor found for: {0}.
+ /// </summary>
+ internal static string Error_NoOpenEditor {
+ get {
+ return ResourceManager.GetString("Error_NoOpenEditor", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to No Previewer found for connection provider: {0}.
+ /// </summary>
+ internal static string Error_NoPreviewer {
+ get {
+ return ResourceManager.GetString("Error_NoPreviewer", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to IronPython Console.
/// </summary>
internal static string Title_IronPython_Console {
Modified: trunk/Tools/Maestro/Maestro.AddIn.Scripting/Strings.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Scripting/Strings.resx 2012-10-31 04:02:33 UTC (rev 7171)
+++ trunk/Tools/Maestro/Maestro.AddIn.Scripting/Strings.resx 2012-10-31 04:57:53 UTC (rev 7172)
@@ -117,6 +117,12 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <data name="Error_NoOpenEditor" xml:space="preserve">
+ <value>No Open Editor found for: {0}</value>
+ </data>
+ <data name="Error_NoPreviewer" xml:space="preserve">
+ <value>No Previewer found for connection provider: {0}</value>
+ </data>
<data name="Title_IronPython_Console" xml:space="preserve">
<value>IronPython Console</value>
</data>
Modified: trunk/Tools/Maestro/Maestro.Base/Editor/EditorContentBase.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/EditorContentBase.cs 2012-10-31 04:02:33 UTC (rev 7171)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/EditorContentBase.cs 2012-10-31 04:57:53 UTC (rev 7172)
@@ -93,6 +93,7 @@
}
_svc = value;
+ _svc.PreviewLocale = PropertyService.Get(ConfigProperties.PreviewLocale, ConfigProperties.DefaultPreviewLocale);
_svc.DirtyStateChanged += OnDirtyStateChanged;
_svc.Saved += OnSaved;
_svc.BeforeSave += OnBeforeSave;
@@ -352,7 +353,7 @@
_svc.PrePreviewProcess();
var previewer = ResourcePreviewerFactory.GetPreviewer(conn.ProviderName);
if (previewer != null)
- previewer.Preview(this.Resource, this.EditorService);
+ previewer.Preview(this.Resource, this.EditorService, _svc.PreviewLocale);
}
/// <summary>
Modified: trunk/Tools/Maestro/Maestro.Base/Editor/ResourcePreviewEngine.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Editor/ResourcePreviewEngine.cs 2012-10-31 04:02:33 UTC (rev 7171)
+++ trunk/Tools/Maestro/Maestro.Base/Editor/ResourcePreviewEngine.cs 2012-10-31 04:57:53 UTC (rev 7172)
@@ -45,20 +45,25 @@
_edSvc = edSvc;
}
- private string GenerateFeatureSourcePreviewUrl(IResource res)
+ static string GetLocale(string locale)
{
+ return string.IsNullOrEmpty(locale) ? "en" : locale; //NOXLATE
+ }
+
+ private string GenerateFeatureSourcePreviewUrl(IResource res, string locale)
+ {
string url = _rootUrl;
if (!url.EndsWith("/")) //NOXLATE
url += "/"; //NOXLATE
var resId = res.ResourceID;
var sessionId = _edSvc.SessionID;
- url += "schemareport/describeschema.php?viewer=basic&schemaName=&className=&resId=" + resId + "&sessionId=" + sessionId; //NOXLATE
+ url += "schemareport/describeschema.php?viewer=basic&schemaName=&className=&resId=" + resId + "&sessionId=" + sessionId + "&locale=" + GetLocale(locale); //NOXLATE
return url;
}
- private string GenerateLayerPreviewUrl(IResource res)
+ private string GenerateLayerPreviewUrl(IResource res, string locale)
{
string url = _rootUrl;
if (!url.EndsWith("/")) //NOXLATE
@@ -97,7 +102,7 @@
var resId = "Session:" + sessionId + "//" + Guid.NewGuid() + ".WebLayout"; //NOXLATE
conn.ResourceService.SaveResourceAs(wl, resId);
- url += "mapviewerajax/?WEBLAYOUT=" + resId + "&SESSION=" + sessionId; //NOXLATE
+ url += "mapviewerajax/?WEBLAYOUT=" + resId + "&SESSION=" + sessionId + "&LOCALE=" + GetLocale(locale); //NOXLATE
}
else
{
@@ -174,7 +179,7 @@
wl.ToolBar.AddItem(menu);
}
- private string GenerateWatermarkPreviewUrl(IWatermarkDefinition wmd)
+ private string GenerateWatermarkPreviewUrl(IWatermarkDefinition wmd, string locale)
{
//We demand a 2.3.0 Map Definition or higher
if (wmd.CurrentConnection.SiteVersion < new Version(2, 3))
@@ -184,10 +189,10 @@
map.CoordinateSystem = @"LOCAL_CS[""*XY-M*"", LOCAL_DATUM[""*X-Y*"", 10000], UNIT[""Meter"", 1], AXIS[""X"", EAST], AXIS[""Y"", NORTH]]"; //NOXLATE
map.Extents = ObjectFactory.CreateEnvelope(-1000000, -1000000, 1000000, 1000000);
map.AddWatermark(wmd);
- return GenerateMapPreviewUrl(map);
+ return GenerateMapPreviewUrl(map, locale);
}
- private string GenerateMapPreviewUrl(IResource res)
+ private string GenerateMapPreviewUrl(IResource res, string locale)
{
string url = _rootUrl;
if (!url.EndsWith("/")) //NOXLATE
@@ -211,7 +216,7 @@
var resId = "Session:" + sessionId + "//" + Guid.NewGuid() + ".WebLayout"; //NOXLATE
conn.ResourceService.SaveResourceAs(wl, resId);
- url += "mapviewerajax/?WEBLAYOUT=" + resId + "&SESSION=" + sessionId; //NOXLATE
+ url += "mapviewerajax/?WEBLAYOUT=" + resId + "&SESSION=" + sessionId + "&LOCALE=" + GetLocale(locale); //NOXLATE
}
else
{
@@ -228,7 +233,7 @@
return url;
}
- private string GenerateWebLayoutPreviewUrl(IResource res)
+ private string GenerateWebLayoutPreviewUrl(IResource res, string locale)
{
string url = _rootUrl;
if (!url.EndsWith("/")) //NOXLATE
@@ -240,12 +245,12 @@
var conn = wl.CurrentConnection;
conn.ResourceService.SaveResourceAs(wl, resId);
- url += "mapviewerajax/?WEBLAYOUT=" + resId + "&SESSION=" + sessionId; //NOXLATE
+ url += "mapviewerajax/?WEBLAYOUT=" + resId + "&SESSION=" + sessionId + "&LOCALE=" + GetLocale(locale); //NOXLATE
return url;
}
- private string GenerateFlexLayoutPreviewUrl(IResource res)
+ private string GenerateFlexLayoutPreviewUrl(IResource res, string locale)
{
string url = _rootUrl;
if (!url.EndsWith("/")) //NOXLATE
@@ -258,26 +263,26 @@
var resId = "Session:" + sessionId + "//" + Guid.NewGuid() + ".ApplicationDefinition"; //NOXLATE
conn.ResourceService.SaveResourceAs(appDef, resId);
- url += appDef.TemplateUrl + "?Session=" + sessionId + "&ApplicationDefinition=" + resId; //NOXLATE
+ url += appDef.TemplateUrl + "?Session=" + sessionId + "&ApplicationDefinition=" + resId + "&locale=" + GetLocale(locale); //NOXLATE
return url;
}
- public string GeneratePreviewUrl(IResource res)
+ public string GeneratePreviewUrl(IResource res, string locale)
{
switch (res.ResourceType)
{
case ResourceTypes.FeatureSource:
- return GenerateFeatureSourcePreviewUrl(res);
+ return GenerateFeatureSourcePreviewUrl(res, locale);
case ResourceTypes.ApplicationDefinition:
- return GenerateFlexLayoutPreviewUrl(res);
+ return GenerateFlexLayoutPreviewUrl(res, locale);
case ResourceTypes.LayerDefinition:
- return GenerateLayerPreviewUrl(res);
+ return GenerateLayerPreviewUrl(res, locale);
case ResourceTypes.MapDefinition:
- return GenerateMapPreviewUrl(res);
+ return GenerateMapPreviewUrl(res, locale);
case ResourceTypes.WebLayout:
- return GenerateWebLayoutPreviewUrl(res);
+ return GenerateWebLayoutPreviewUrl(res, locale);
case ResourceTypes.WatermarkDefinition:
- return GenerateWatermarkPreviewUrl((IWatermarkDefinition)res);
+ return GenerateWatermarkPreviewUrl((IWatermarkDefinition)res, locale);
default:
throw new InvalidOperationException(Strings.UnpreviewableResourceType);
}
Modified: trunk/Tools/Maestro/Maestro.Base/Services/ResourcePreviewerFactory.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/Services/ResourcePreviewerFactory.cs 2012-10-31 04:02:33 UTC (rev 7171)
+++ trunk/Tools/Maestro/Maestro.Base/Services/ResourcePreviewerFactory.cs 2012-10-31 04:57:53 UTC (rev 7172)
@@ -51,6 +51,18 @@
/// <param name="res">The resource to be previewed</param>
/// <param name="edSvc">The editor service</param>
void Preview(IResource res, IEditorService edSvc);
+
+ /// <summary>
+ /// Previews the specified resource using the given locale
+ /// </summary>
+ /// <param name="res">The resource to be previewed</param>
+ /// <param name="edSvc">The editor service</param>
+ /// <param name="locale">The locale</param>
+ /// <remarks>
+ /// The locale parameter should be treated as a hint. The underlying <see cref="T:OSGeo.MapGuide.MaestroAPI.IServerConnection"/> implementation
+ /// may not actually respect this value.
+ /// </remarks>
+ void Preview(IResource res, IEditorService edSvc, string locale);
}
/// <summary>
@@ -80,6 +92,16 @@
/// <param name="edSvc">The editor service</param>
public void Preview(IResource res, IEditorService edSvc)
{
+ Preview(res, edSvc, edSvc.PreviewLocale);
+ }
+
+ /// <summary>
+ /// Previews the specified resource
+ /// </summary>
+ /// <param name="res">The resource to be previewed</param>
+ /// <param name="edSvc">The editor service</param>
+ public void Preview(IResource res, IEditorService edSvc, string locale)
+ {
//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
@@ -133,7 +155,7 @@
else
{
//Now feed it to the preview engine
- var url = new ResourcePreviewEngine(mapguideRootUrl, edSvc).GeneratePreviewUrl(previewCopy);
+ var url = new ResourcePreviewEngine(mapguideRootUrl, edSvc).GeneratePreviewUrl(previewCopy, locale);
return new UrlPreviewResult() { Url = url };
}
}, (result) => {
Modified: trunk/Tools/Maestro/Maestro.Base/UI/Preferences/ConfigProperties.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/Preferences/ConfigProperties.cs 2012-10-31 04:02:33 UTC (rev 7171)
+++ trunk/Tools/Maestro/Maestro.Base/UI/Preferences/ConfigProperties.cs 2012-10-31 04:57:53 UTC (rev 7172)
@@ -33,6 +33,11 @@
public static class ConfigProperties
{
/// <summary>
+ /// The locale to preview in
+ /// </summary>
+ public const string PreviewLocale = "General.PreviewLocale"; //NOXLATE
+
+ /// <summary>
/// The type of viewer to preview
/// </summary>
public const string PreviewViewerType = "General.PreviewViewerType"; //NOXLATE
@@ -105,6 +110,7 @@
internal static void ApplyEditorDefaults()
{
+ Props.Set(ConfigProperties.PreviewLocale, DefaultPreviewLocale);
Props.Set(ConfigProperties.ValidateOnSave, DefaultValidateOnSave);
Props.Set(ConfigProperties.XsdSchemaPath, DefaultXsdSchemaPath);
}
@@ -124,6 +130,8 @@
Props.Set(ConfigProperties.LiveMapEditorPath, DefaultLiveMapEditorPath);
}
+ public static string DefaultPreviewLocale { get { return "en"; } } //NOXLATE
+
/// <summary>
/// Default setting for "Show tip of the day"
/// </summary>
Modified: trunk/Tools/Maestro/Maestro.Base/UI/Preferences/EditorPreferencesCtrl.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/Preferences/EditorPreferencesCtrl.Designer.cs 2012-10-31 04:02:33 UTC (rev 7171)
+++ trunk/Tools/Maestro/Maestro.Base/UI/Preferences/EditorPreferencesCtrl.Designer.cs 2012-10-31 04:57:53 UTC (rev 7172)
@@ -32,16 +32,20 @@
this.chkValidateOnSave = new System.Windows.Forms.CheckBox();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.btnBrowseXsdPath = new System.Windows.Forms.Button();
+ this.label4 = new System.Windows.Forms.Label();
this.txtXsdPath = new System.Windows.Forms.TextBox();
- this.label4 = new System.Windows.Forms.Label();
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.txtPreviewLocale = new System.Windows.Forms.TextBox();
this.groupBox4.SuspendLayout();
this.groupBox1.SuspendLayout();
+ this.groupBox2.SuspendLayout();
this.SuspendLayout();
//
// groupBox4
//
- this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
+ this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox4.Controls.Add(this.chkValidateOnSave);
this.groupBox4.Location = new System.Drawing.Point(3, 3);
this.groupBox4.Name = "groupBox4";
@@ -63,8 +67,8 @@
//
// groupBox1
//
- this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
+ this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox1.Controls.Add(this.btnBrowseXsdPath);
this.groupBox1.Controls.Add(this.label4);
this.groupBox1.Controls.Add(this.txtXsdPath);
@@ -87,16 +91,6 @@
this.btnBrowseXsdPath.UseVisualStyleBackColor = true;
this.btnBrowseXsdPath.Click += new System.EventHandler(this.btnBrowseXsdPath_Click);
//
- // txtXsdPath
- //
- this.txtXsdPath.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.txtXsdPath.Location = new System.Drawing.Point(112, 24);
- this.txtXsdPath.Name = "txtXsdPath";
- this.txtXsdPath.ReadOnly = true;
- this.txtXsdPath.Size = new System.Drawing.Size(249, 20);
- this.txtXsdPath.TabIndex = 13;
- //
// label4
//
this.label4.AutoSize = true;
@@ -107,10 +101,50 @@
this.label4.TabIndex = 12;
this.label4.Text = "Xml Schema Path";
//
+ // txtXsdPath
+ //
+ this.txtXsdPath.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtXsdPath.Location = new System.Drawing.Point(112, 24);
+ this.txtXsdPath.Name = "txtXsdPath";
+ this.txtXsdPath.ReadOnly = true;
+ this.txtXsdPath.Size = new System.Drawing.Size(249, 20);
+ this.txtXsdPath.TabIndex = 13;
+ //
+ // groupBox2
+ //
+ this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.groupBox2.Controls.Add(this.txtPreviewLocale);
+ this.groupBox2.Controls.Add(this.label1);
+ this.groupBox2.Location = new System.Drawing.Point(4, 132);
+ this.groupBox2.Name = "groupBox2";
+ this.groupBox2.Size = new System.Drawing.Size(398, 60);
+ this.groupBox2.TabIndex = 12;
+ this.groupBox2.TabStop = false;
+ this.groupBox2.Text = "Localization";
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(15, 25);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(166, 13);
+ this.label1.TabIndex = 0;
+ this.label1.Text = "Preview using the following locale";
+ //
+ // txtPreviewLocale
+ //
+ this.txtPreviewLocale.Location = new System.Drawing.Point(187, 22);
+ this.txtPreviewLocale.Name = "txtPreviewLocale";
+ this.txtPreviewLocale.Size = new System.Drawing.Size(47, 20);
+ this.txtPreviewLocale.TabIndex = 1;
+ //
// EditorPreferencesCtrl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.groupBox4);
this.Name = "EditorPreferencesCtrl";
@@ -119,6 +153,8 @@
this.groupBox4.PerformLayout();
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
+ this.groupBox2.ResumeLayout(false);
+ this.groupBox2.PerformLayout();
this.ResumeLayout(false);
}
@@ -131,5 +167,8 @@
private System.Windows.Forms.Button btnBrowseXsdPath;
private System.Windows.Forms.TextBox txtXsdPath;
private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.GroupBox groupBox2;
+ private System.Windows.Forms.TextBox txtPreviewLocale;
+ private System.Windows.Forms.Label label1;
}
}
Modified: trunk/Tools/Maestro/Maestro.Base/UI/Preferences/EditorPreferencesCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/Preferences/EditorPreferencesCtrl.cs 2012-10-31 04:02:33 UTC (rev 7171)
+++ trunk/Tools/Maestro/Maestro.Base/UI/Preferences/EditorPreferencesCtrl.cs 2012-10-31 04:57:53 UTC (rev 7172)
@@ -37,6 +37,8 @@
var path = Props.Get(ConfigProperties.XsdSchemaPath, ConfigProperties.DefaultXsdSchemaPath);
txtXsdPath.Text = path;
+
+ txtPreviewLocale.Text = Props.Get(ConfigProperties.PreviewLocale, ConfigProperties.DefaultPreviewLocale);
}
public string Title
@@ -54,6 +56,7 @@
bool restart = false;
Apply(ConfigProperties.ValidateOnSave, chkValidateOnSave.Checked);
+ Apply(ConfigProperties.PreviewLocale, txtPreviewLocale.Text);
//These changes require restart
if (Apply(ConfigProperties.XsdSchemaPath, txtXsdPath.Text))
Modified: trunk/Tools/Maestro/Maestro.Base/UI/Preferences/EditorPreferencesCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Base/UI/Preferences/EditorPreferencesCtrl.resx 2012-10-31 04:02:33 UTC (rev 7171)
+++ trunk/Tools/Maestro/Maestro.Base/UI/Preferences/EditorPreferencesCtrl.resx 2012-10-31 04:57:53 UTC (rev 7172)
@@ -112,9 +112,9 @@
<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>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexLayoutSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexLayoutSettingsCtrl.cs 2012-10-31 04:02:33 UTC (rev 7171)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/FlexLayoutSettingsCtrl.cs 2012-10-31 04:57:53 UTC (rev 7172)
@@ -102,7 +102,7 @@
if (!_edsvc.IsNew)
{
- txtPublicUrl.Text = baseUrl + txtTemplateUrl.Text + "?ApplicationDefinition=" + _edsvc.ResourceID; //NOXLATE
+ txtPublicUrl.Text = baseUrl + txtTemplateUrl.Text + "?ApplicationDefinition=" + _edsvc.ResourceID + "&locale=" + _edsvc.PreviewLocale; //NOXLATE
btnShowInBrowser.Enabled = true;
}
else
Modified: trunk/Tools/Maestro/Maestro.Editors/IEditorService.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/IEditorService.cs 2012-10-31 04:02:33 UTC (rev 7171)
+++ trunk/Tools/Maestro/Maestro.Editors/IEditorService.cs 2012-10-31 04:57:53 UTC (rev 7172)
@@ -38,6 +38,10 @@
public interface IEditorService
{
/// <summary>
+ /// Gets the locale for previewing
+ /// </summary>
+ string PreviewLocale { get; set; }
+ /// <summary>
/// Indicates if a specified custom command is supported and can be created
/// </summary>
/// <param name="cmdType"></param>
Modified: trunk/Tools/Maestro/Maestro.Editors/ResourceEditorServiceBase.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/ResourceEditorServiceBase.cs 2012-10-31 04:02:33 UTC (rev 7171)
+++ trunk/Tools/Maestro/Maestro.Editors/ResourceEditorServiceBase.cs 2012-10-31 04:57:53 UTC (rev 7172)
@@ -55,9 +55,19 @@
this.IsNew = ResourceIdentifier.IsSessionBased(resourceID);
this.ResourceID = resourceID;
_conn = conn;
+ this.PreviewLocale = "en"; //NOXLATE
}
/// <summary>
+ /// Gets the locale to use for previewing
+ /// </summary>
+ public virtual string PreviewLocale
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
/// Raised when the edited resource has changed
/// </summary>
public event EventHandler DirtyStateChanged;
Modified: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolEditorService.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolEditorService.cs 2012-10-31 04:02:33 UTC (rev 7171)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SymbolEditorService.cs 2012-10-31 04:57:53 UTC (rev 7172)
@@ -36,6 +36,7 @@
{
_inner = edSvc;
_symDef = symDef;
+ this.PreviewLocale = "en"; //NOXLATE
}
public bool SupportsCommand(CommandType cmdType)
@@ -234,5 +235,11 @@
}
public event EventHandler BeforePreview;
+
+ public string PreviewLocale
+ {
+ get;
+ set;
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.cs 2012-10-31 04:02:33 UTC (rev 7171)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.cs 2012-10-31 04:57:53 UTC (rev 7172)
@@ -128,7 +128,7 @@
if (!_edsvc.IsNew)
{
- txtAjaxViewerUrl.Text = baseUrl + "mapviewerajax/?WEBLAYOUT=" + _edsvc.ResourceID;
+ txtAjaxViewerUrl.Text = baseUrl + "mapviewerajax/?WEBLAYOUT=" + _edsvc.ResourceID + "&LOCALE=" + _edsvc.PreviewLocale;
btnShowInBrowser.Enabled = true;
}
else
Modified: trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.resx 2012-10-31 04:02:33 UTC (rev 7171)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.resx 2012-10-31 04:57:53 UTC (rev 7172)
@@ -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="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="chkPingServer.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="chkPingServer.Location" type="System.Drawing.Point, System.Drawing">
<value>152, 67</value>
</data>
@@ -138,7 +138,7 @@
<value>chkPingServer</value>
</data>
<data name=">>chkPingServer.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkPingServer.Parent" xml:space="preserve">
<value>contentPanel</value>
@@ -146,7 +146,7 @@
<data name=">>chkPingServer.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <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="btnShowInBrowser.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Right</value>
</data>
@@ -166,7 +166,7 @@
<value>btnShowInBrowser</value>
</data>
<data name=">>btnShowInBrowser.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=">>btnShowInBrowser.Parent" xml:space="preserve">
<value>contentPanel</value>
@@ -190,7 +190,7 @@
<value>txtAjaxViewerUrl</value>
</data>
<data name=">>txtAjaxViewerUrl.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtAjaxViewerUrl.Parent" xml:space="preserve">
<value>contentPanel</value>
@@ -217,7 +217,7 @@
<value>label11</value>
</data>
<data name=">>label11.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label11.Parent" xml:space="preserve">
<value>contentPanel</value>
@@ -244,7 +244,7 @@
<value>label10</value>
</data>
<data name=">>label10.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label10.Parent" xml:space="preserve">
<value>contentPanel</value>
@@ -265,7 +265,7 @@
<value>cmbHyperlinkTarget</value>
</data>
<data name=">>cmbHyperlinkTarget.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>cmbHyperlinkTarget.Parent" xml:space="preserve">
<value>contentPanel</value>
@@ -289,7 +289,7 @@
<value>txtHyperlinkFrame</value>
</data>
<data name=">>txtHyperlinkFrame.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtHyperlinkFrame.Parent" xml:space="preserve">
<value>contentPanel</value>
@@ -313,7 +313,7 @@
<value>txtInitialTaskPaneUrl</value>
</data>
<data name=">>txtInitialTaskPaneUrl.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtInitialTaskPaneUrl.Parent" xml:space="preserve">
<value>contentPanel</value>
@@ -340,7 +340,7 @@
<value>label9</value>
</data>
<data name=">>label9.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label9.Parent" xml:space="preserve">
<value>contentPanel</value>
@@ -370,7 +370,7 @@
<value>label8</value>
</data>
<data name=">>label8.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label8.Parent" xml:space="preserve">
<value>groupBox5</value>
@@ -391,7 +391,7 @@
<value>numTaskPaneWidth</value>
</data>
<data name=">>numTaskPaneWidth.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>numTaskPaneWidth.Parent" xml:space="preserve">
<value>groupBox5</value>
@@ -418,7 +418,7 @@
<value>chkTaskBar</value>
</data>
<data name=">>chkTaskBar.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkTaskBar.Parent" xml:space="preserve">
<value>groupBox5</value>
@@ -445,7 +445,7 @@
<value>chkTaskPane</value>
</data>
<data name=">>chkTaskPane.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkTaskPane.Parent" xml:space="preserve">
<value>groupBox5</value>
@@ -469,7 +469,7 @@
<value>groupBox5</value>
</data>
<data name=">>groupBox5.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=">>groupBox5.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -500,7 +500,7 @@
<value>chkZoomControl</value>
</data>
<data name=">>chkZoomControl.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkZoomControl.Parent" xml:space="preserve">
<value>groupBox4</value>
@@ -527,7 +527,7 @@
<value>chkStatusBar</value>
</data>
<data name=">>chkStatusBar.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkStatusBar.Parent" xml:space="preserve">
<value>groupBox4</value>
@@ -554,7 +554,7 @@
<value>chkContextMenu</value>
</data>
<data name=">>chkContextMenu.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkContextMenu.Parent" xml:space="preserve">
<value>groupBox4</value>
@@ -581,7 +581,7 @@
<value>chkToolbar</value>
</data>
<data name=">>chkToolbar.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkToolbar.Parent" xml:space="preserve">
<value>groupBox4</value>
@@ -605,7 +605,7 @@
<value>groupBox4</value>
</data>
<data name=">>groupBox4.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=">>groupBox4.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -632,7 +632,7 @@
<value>label7</value>
</data>
<data name=">>label7.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label7.Parent" xml:space="preserve">
<value>groupBox3</value>
@@ -653,7 +653,7 @@
<value>numInfoPaneWidth</value>
</data>
<data name=">>numInfoPaneWidth.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>numInfoPaneWidth.Parent" xml:space="preserve">
<value>groupBox3</value>
@@ -680,7 +680,7 @@
<value>chkProperties</value>
</data>
<data name=">>chkProperties.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkProperties.Parent" xml:space="preserve">
<value>groupBox3</value>
@@ -707,7 +707,7 @@
<value>chkLegend</value>
</data>
<data name=">>chkLegend.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkLegend.Parent" xml:space="preserve">
<value>groupBox3</value>
@@ -731,7 +731,7 @@
<value>groupBox3</value>
</data>
<data name=">>groupBox3.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=">>groupBox3.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -755,7 +755,7 @@
<value>groupBox2</value>
</data>
<data name=">>groupBox2.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=">>groupBox2.Parent" xml:space="preserve">
<value>contentPanel</value>
@@ -786,7 +786,7 @@
<value>chkCustomView</value>
</data>
<data name=">>chkCustomView.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkCustomView.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -807,7 +807,7 @@
<value>numX</value>
</data>
<data name=">>numX.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>numX.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -828,7 +828,7 @@
<value>numY</value>
</data>
<data name=">>numY.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>numY.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -849,7 +849,7 @@
<value>numScale</value>
</data>
<data name=">>numScale.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>numScale.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -876,7 +876,7 @@
<value>label6</value>
</data>
<data name=">>label6.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label6.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -903,7 +903,7 @@
<value>label5</value>
</data>
<data name=">>label5.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label5.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -930,7 +930,7 @@
<value>label4</value>
</data>
<data name=">>label4.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label4.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -957,7 +957,7 @@
<value>label3</value>
</data>
<data name=">>label3.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label3.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -978,7 +978,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>contentPanel</value>
@@ -1005,7 +1005,7 @@
<value>btnBrowse</value>
</data>
<data name=">>btnBrowse.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=">>btnBrowse.Parent" xml:space="preserve">
<value>contentPanel</value>
@@ -1029,7 +1029,7 @@
<value>txtMapDefinition</value>
</data>
<data name=">>txtMapDefinition.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtMapDefinition.Parent" xml:space="preserve">
<value>contentPanel</value>
@@ -1056,7 +1056,7 @@
<value>label2</value>
</data>
<data name=">>label2.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label2.Parent" xml:space="preserve">
<value>contentPanel</value>
@@ -1080,7 +1080,7 @@
<value>txtBrowserTitle</value>
</data>
<data name=">>txtBrowserTitle.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtBrowserTitle.Parent" xml:space="preserve">
<value>contentPanel</value>
@@ -1107,7 +1107,7 @@
<value>label1</value>
</data>
<data name=">>label1.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label1.Parent" xml:space="preserve">
<value>contentPanel</value>
@@ -1122,7 +1122,7 @@
<value>contentPanel</value>
</data>
<data name=">>contentPanel.Type" xml:space="preserve">
- <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>contentPanel.Parent" xml:space="preserve">
<value>$this</value>
@@ -1130,7 +1130,7 @@
<data name=">>contentPanel.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.HeaderText" xml:space="preserve">
@@ -1143,6 +1143,6 @@
<value>WebLayoutSettingsCtrl</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>Maestro.Editors.Common.EditorBindableCollapsiblePanel, Maestro.Editors, Version=4.0.0.6216, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.Common.EditorBindableCollapsiblePanel, Maestro.Editors, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
</root>
\ No newline at end of file
More information about the mapguide-commits
mailing list