[mapguide-commits] r7564 - in trunk/Tools/Maestro/Maestro.AddIn.Local: . Properties Services UI
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Jun 6 00:07:38 PDT 2013
Author: jng
Date: 2013-06-06 00:07:38 -0700 (Thu, 06 Jun 2013)
New Revision: 7564
Added:
trunk/Tools/Maestro/Maestro.AddIn.Local/Strings.Designer.cs
trunk/Tools/Maestro/Maestro.AddIn.Local/Strings.resx
Modified:
trunk/Tools/Maestro/Maestro.AddIn.Local/Maestro.AddIn.Local.csproj
trunk/Tools/Maestro/Maestro.AddIn.Local/Properties/Resources.Designer.cs
trunk/Tools/Maestro/Maestro.AddIn.Local/Properties/Resources.resx
trunk/Tools/Maestro/Maestro.AddIn.Local/Services/LocalPreviewer.cs
trunk/Tools/Maestro/Maestro.AddIn.Local/UI/MapPreviewWindow.cs
Log:
Local AddIn changes:
- Abort preview attempt on null extents
- Move localizable strings to Strings.resx
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/Maestro.AddIn.Local.csproj
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/Maestro.AddIn.Local.csproj 2013-06-06 05:34:45 UTC (rev 7563)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Maestro.AddIn.Local.csproj 2013-06-06 07:07:38 UTC (rev 7564)
@@ -105,6 +105,11 @@
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Services\LocalPreviewer.cs" />
+ <Compile Include="Strings.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>Strings.resx</DependentUpon>
+ </Compile>
<Compile Include="UI\ConnectionPoolStatusDialog.cs">
<SubType>Form</SubType>
</Compile>
@@ -919,6 +924,10 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
+ <EmbeddedResource Include="Strings.resx">
+ <Generator>ResXFileCodeGenerator</Generator>
+ <LastGenOutput>Strings.Designer.cs</LastGenOutput>
+ </EmbeddedResource>
<EmbeddedResource Include="UI\ConnectionPoolStatusDialog.resx">
<DependentUpon>ConnectionPoolStatusDialog.cs</DependentUpon>
</EmbeddedResource>
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/Properties/Resources.Designer.cs 2013-06-06 05:34:45 UTC (rev 7563)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Properties/Resources.Designer.cs 2013-06-06 07:07:38 UTC (rev 7564)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.239
+// Runtime Version:4.0.30319.18034
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -60,6 +60,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap arrow {
get {
object obj = ResourceManager.GetObject("arrow", resourceCulture);
@@ -67,6 +70,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap arrow_045 {
get {
object obj = ResourceManager.GetObject("arrow-045", resourceCulture);
@@ -74,6 +80,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap arrow_090 {
get {
object obj = ResourceManager.GetObject("arrow-090", resourceCulture);
@@ -81,6 +90,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap arrow_135 {
get {
object obj = ResourceManager.GetObject("arrow-135", resourceCulture);
@@ -88,6 +100,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap arrow_180 {
get {
object obj = ResourceManager.GetObject("arrow-180", resourceCulture);
@@ -95,6 +110,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap arrow_225 {
get {
object obj = ResourceManager.GetObject("arrow-225", resourceCulture);
@@ -102,6 +120,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap arrow_270 {
get {
object obj = ResourceManager.GetObject("arrow-270", resourceCulture);
@@ -109,6 +130,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap arrow_315 {
get {
object obj = ResourceManager.GetObject("arrow-315", resourceCulture);
@@ -116,6 +140,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap icon_clearselect {
get {
object obj = ResourceManager.GetObject("icon_clearselect", resourceCulture);
@@ -123,6 +150,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap lc_select {
get {
object obj = ResourceManager.GetObject("lc_select", resourceCulture);
@@ -131,14 +161,8 @@
}
/// <summary>
- /// Looks up a localized string similar to Local Connection Pool Status.
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
- internal static string LocalConnectionPoolStatus {
- get {
- return ResourceManager.GetString("LocalConnectionPoolStatus", resourceCulture);
- }
- }
-
internal static System.Drawing.Bitmap magnifier_zoom_fit {
get {
object obj = ResourceManager.GetObject("magnifier-zoom-fit", resourceCulture);
@@ -146,6 +170,9 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap magnifier_zoom_in {
get {
object obj = ResourceManager.GetObject("magnifier-zoom-in", resourceCulture);
@@ -153,20 +180,14 @@
}
}
+ /// <summary>
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ /// </summary>
internal static System.Drawing.Bitmap magnifier_zoom_out {
get {
object obj = ResourceManager.GetObject("magnifier-zoom-out", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
-
- /// <summary>
- /// Looks up a localized string similar to WARNING: The Map Preview does not yet support rendering of tiled layers. Such layers will be rendered as normal layers for the purpose of this preview.
- /// </summary>
- internal static string TiledLayerSupportWarning {
- get {
- return ResourceManager.GetString("TiledLayerSupportWarning", resourceCulture);
- }
- }
}
}
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/Properties/Resources.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/Properties/Resources.resx 2013-06-06 05:34:45 UTC (rev 7563)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Properties/Resources.resx 2013-06-06 07:07:38 UTC (rev 7564)
@@ -112,12 +112,12 @@
<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="arrow-180" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\arrow-180.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -157,10 +157,4 @@
<data name="arrow-045" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\arrow-045.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="TiledLayerSupportWarning" xml:space="preserve">
- <value>WARNING: The Map Preview does not yet support rendering of tiled layers. Such layers will be rendered as normal layers for the purpose of this preview</value>
- </data>
- <data name="LocalConnectionPoolStatus" xml:space="preserve">
- <value>Local Connection Pool Status</value>
- </data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/Services/LocalPreviewer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/Services/LocalPreviewer.cs 2013-06-06 05:34:45 UTC (rev 7563)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Services/LocalPreviewer.cs 2013-06-06 07:07:38 UTC (rev 7564)
@@ -64,6 +64,8 @@
var ldf = (ILayerDefinition)res;
string wkt;
var env = ldf.GetSpatialExtent(true, out wkt);
+ if (env == null)
+ throw new ApplicationException(Strings.CouldNotComputeExtentsForPreview);
mapDef = ObjectFactory.CreateMapDefinition(conn, "Preview");
mapDef.CoordinateSystem = wkt;
mapDef.SetExtents(env.MinX, env.MinY, env.MaxX, env.MaxY);
Added: trunk/Tools/Maestro/Maestro.AddIn.Local/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/Strings.Designer.cs (rev 0)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Strings.Designer.cs 2013-06-06 07:07:38 UTC (rev 7564)
@@ -0,0 +1,90 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.18034
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Maestro.AddIn.Local {
+ using System;
+
+
+ /// <summary>
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ /// </summary>
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ internal class Strings {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Strings() {
+ }
+
+ /// <summary>
+ /// Returns the cached ResourceManager instance used by this class.
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Maestro.AddIn.Local.Strings", typeof(Strings).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ /// <summary>
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Could not compute extents for preview.
+ /// </summary>
+ internal static string CouldNotComputeExtentsForPreview {
+ get {
+ return ResourceManager.GetString("CouldNotComputeExtentsForPreview", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Local Connection Pool Status.
+ /// </summary>
+ internal static string LocalConnectionPoolStatus {
+ get {
+ return ResourceManager.GetString("LocalConnectionPoolStatus", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to WARNING: The Map Preview does not yet support rendering of tiled layers. Such layers will be rendered as normal layers for the purpose of this preview.
+ /// </summary>
+ internal static string TiledLayerSupportWarning {
+ get {
+ return ResourceManager.GetString("TiledLayerSupportWarning", resourceCulture);
+ }
+ }
+ }
+}
Added: trunk/Tools/Maestro/Maestro.AddIn.Local/Strings.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/Strings.resx (rev 0)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/Strings.resx 2013-06-06 07:07:38 UTC (rev 7564)
@@ -0,0 +1,129 @@
+<?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>
+ <data name="CouldNotComputeExtentsForPreview" xml:space="preserve">
+ <value>Could not compute extents for preview</value>
+ </data>
+ <data name="LocalConnectionPoolStatus" xml:space="preserve">
+ <value>Local Connection Pool Status</value>
+ </data>
+ <data name="TiledLayerSupportWarning" xml:space="preserve">
+ <value>WARNING: The Map Preview does not yet support rendering of tiled layers. Such layers will be rendered as normal layers for the purpose of this preview</value>
+ </data>
+</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/UI/MapPreviewWindow.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/UI/MapPreviewWindow.cs 2013-06-06 05:34:45 UTC (rev 7563)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/UI/MapPreviewWindow.cs 2013-06-06 07:07:38 UTC (rev 7564)
@@ -62,7 +62,7 @@
var grp = groups.GetItem(i);
if (grp.LayerGroupType == MgLayerGroupType.BaseMap)
{
- MessageBox.Show(Properties.Resources.TiledLayerSupportWarning);
+ MessageBox.Show(Strings.TiledLayerSupportWarning);
break;
}
}
More information about the mapguide-commits
mailing list