[mapguide-commits] r7067 - in branches/2.4/MgDev/Desktop: MapViewer MgAppLayout

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Wed Oct 3 07:52:58 PDT 2012


Author: jng
Date: 2012-10-03 07:52:57 -0700 (Wed, 03 Oct 2012)
New Revision: 7067

Added:
   branches/2.4/MgDev/Desktop/MapViewer/MgSearchComponent.cs
   branches/2.4/MgDev/Desktop/MapViewer/MgSearchControlImpl.Designer.cs
   branches/2.4/MgDev/Desktop/MapViewer/MgSearchControlImpl.cs
   branches/2.4/MgDev/Desktop/MapViewer/MgSearchControlImpl.resx
Modified:
   branches/2.4/MgDev/Desktop/MapViewer/MapViewer.csproj
   branches/2.4/MgDev/Desktop/MapViewer/MgQueryResultsDialog.cs
   branches/2.4/MgDev/Desktop/MapViewer/Strings.Designer.cs
   branches/2.4/MgDev/Desktop/MapViewer/Strings.resx
   branches/2.4/MgDev/Desktop/MgAppLayout/Sheboygan.AppLayout
   branches/2.4/MgDev/Desktop/MgAppLayout/SheboyganTiled.AppLayout
Log:
mg-desktop: This submission includes the following changes:
 - #2116: Implement support for pre-defined search commands. Like the AJAX/Fusion implementation, this is a very simple type of search.
 - Update MgQueryResultsDialog to allow for unbounded search results (ie. A limit of -1 means spin through the entire reader)

Modified: branches/2.4/MgDev/Desktop/MapViewer/MapViewer.csproj
===================================================================
--- branches/2.4/MgDev/Desktop/MapViewer/MapViewer.csproj	2012-10-03 14:07:01 UTC (rev 7066)
+++ branches/2.4/MgDev/Desktop/MapViewer/MapViewer.csproj	2012-10-03 14:52:57 UTC (rev 7067)
@@ -168,6 +168,15 @@
     <Compile Include="MgLayerSelectionHandler.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="MgSearchComponent.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="MgSearchControlImpl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="MgSearchControlImpl.Designer.cs">
+      <DependentUpon>MgSearchControlImpl.cs</DependentUpon>
+    </Compile>
     <Compile Include="MgTaskPane.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -245,6 +254,9 @@
     <EmbeddedResource Include="MgQueryResultsDialog.resx">
       <DependentUpon>MgQueryResultsDialog.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="MgSearchControlImpl.resx">
+      <DependentUpon>MgSearchControlImpl.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="MgTaskPane.resx">
       <DependentUpon>MgTaskPane.cs</DependentUpon>
     </EmbeddedResource>

Modified: branches/2.4/MgDev/Desktop/MapViewer/MgQueryResultsDialog.cs
===================================================================
--- branches/2.4/MgDev/Desktop/MapViewer/MgQueryResultsDialog.cs	2012-10-03 14:07:01 UTC (rev 7066)
+++ branches/2.4/MgDev/Desktop/MapViewer/MgQueryResultsDialog.cs	2012-10-03 14:52:57 UTC (rev 7067)
@@ -79,7 +79,7 @@
             {
                 bgGridLoader.ReportProgress(-1, new InitGridAction() { ColumnNames = propNames.ToArray() });
                 int read = 0;
-                while (reader.ReadNext() && read < _limit)
+                while (reader.ReadNext())
                 {
                     object[] values = new object[propCount];
                     for (int i = 0; i < propCount; i++)
@@ -157,6 +157,8 @@
                     }
                     bgGridLoader.ReportProgress(-1, new AddRow() { Values = values });
                     read++;
+                    if ((_limit > 0 && read >= _limit))
+                        break;
                 }
             }
             finally

Added: branches/2.4/MgDev/Desktop/MapViewer/MgSearchComponent.cs
===================================================================
--- branches/2.4/MgDev/Desktop/MapViewer/MgSearchComponent.cs	                        (rev 0)
+++ branches/2.4/MgDev/Desktop/MapViewer/MgSearchComponent.cs	2012-10-03 14:52:57 UTC (rev 7067)
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OSGeo.MapGuide.Viewer
+{
+    public class MgSearchComponent : MgViewerComponent
+    {
+        /// <summary>
+        /// Gets or sets the layer name this component will search on
+        /// </summary>
+        [MgComponentProperty]
+        public string LayerName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the filter this component will apply as part of the search
+        /// </summary>
+        [MgComponentProperty]
+        public string Filter { get; set; }
+
+        /// <summary>
+        /// Gets or sets the prompt for the user interface
+        /// </summary>
+        [MgComponentProperty]
+        public string Prompt { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Task Pane / Window title
+        /// </summary>
+        [MgComponentProperty]
+        public string Title { get; set; }
+
+        public MgSearchComponent()
+        {
+            this.Icon = Properties.Resources.search;
+            this.Label = this.ToolTipText = this.Title = Strings.TitleSearch;
+            this.Prompt = Strings.TextEnterSearchCriteria;
+        }
+
+        protected override MgControlView CreateControlView()
+        {
+            return new MgSearchControlImpl(this.Viewer, this.Title, this.LayerName, this.Prompt, this.Filter);
+        }
+    }
+}

Added: branches/2.4/MgDev/Desktop/MapViewer/MgSearchControlImpl.Designer.cs
===================================================================
--- branches/2.4/MgDev/Desktop/MapViewer/MgSearchControlImpl.Designer.cs	                        (rev 0)
+++ branches/2.4/MgDev/Desktop/MapViewer/MgSearchControlImpl.Designer.cs	2012-10-03 14:52:57 UTC (rev 7067)
@@ -0,0 +1,73 @@
+namespace OSGeo.MapGuide.Viewer
+{
+    partial class MgSearchControlImpl
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MgSearchControlImpl));
+            this.lblPrompt = new System.Windows.Forms.Label();
+            this.txtSearch = new System.Windows.Forms.TextBox();
+            this.btnSearch = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // lblPrompt
+            // 
+            resources.ApplyResources(this.lblPrompt, "lblPrompt");
+            this.lblPrompt.Name = "lblPrompt";
+            // 
+            // txtSearch
+            // 
+            resources.ApplyResources(this.txtSearch, "txtSearch");
+            this.txtSearch.Name = "txtSearch";
+            // 
+            // btnSearch
+            // 
+            resources.ApplyResources(this.btnSearch, "btnSearch");
+            this.btnSearch.Name = "btnSearch";
+            this.btnSearch.UseVisualStyleBackColor = true;
+            this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
+            // 
+            // MgSearchControlImpl
+            // 
+            resources.ApplyResources(this, "$this");
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.btnSearch);
+            this.Controls.Add(this.txtSearch);
+            this.Controls.Add(this.lblPrompt);
+            this.Name = "MgSearchControlImpl";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label lblPrompt;
+        private System.Windows.Forms.TextBox txtSearch;
+        private System.Windows.Forms.Button btnSearch;
+    }
+}

Added: branches/2.4/MgDev/Desktop/MapViewer/MgSearchControlImpl.cs
===================================================================
--- branches/2.4/MgDev/Desktop/MapViewer/MgSearchControlImpl.cs	                        (rev 0)
+++ branches/2.4/MgDev/Desktop/MapViewer/MgSearchControlImpl.cs	2012-10-03 14:52:57 UTC (rev 7067)
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+
+namespace OSGeo.MapGuide.Viewer
+{
+    public partial class MgSearchControlImpl : MgControlView
+    {
+        private MgSearchControlImpl()
+        {
+            InitializeComponent();
+        }
+
+        private IMapViewer _viewer;
+        private string _filter;
+        private MgLayerBase _layer;
+
+        public MgSearchControlImpl(IMapViewer viewer, string title, string layerName, string prompt, string filter)
+            : this()
+        {
+            _viewer = viewer;
+            this.Title = title;
+            lblPrompt.Text = prompt;
+            _filter = filter;
+
+            if (!_filter.Contains("$USER_VARIABLE")) //NOXLATE
+                throw new InvalidOperationException(Strings.ErrorSearchFilterMissingPlaceholder);
+            
+            var map = viewer.GetMap();
+            var layers = map.GetLayers();
+            var lidx = layers.IndexOf(layerName);
+            if (lidx < 0)
+                throw new InvalidOperationException(string.Format(Strings.ErrorInvalidSearchLayer, layerName));
+
+            _layer = layers.GetItem(lidx);
+        }
+
+        private void btnSearch_Click(object sender, EventArgs e)
+        {
+            var query = new MgFeatureQueryOptions();
+            query.SetFilter(_filter.Replace("$USER_VARIABLE", txtSearch.Text)); //NOXLATE
+
+            var reader = _layer.SelectFeatures(query);
+            new MgQueryResultsDialog(_viewer, _layer, reader, -1).Show();
+        }
+    }
+}

Added: branches/2.4/MgDev/Desktop/MapViewer/MgSearchControlImpl.resx
===================================================================
--- branches/2.4/MgDev/Desktop/MapViewer/MgSearchControlImpl.resx	                        (rev 0)
+++ branches/2.4/MgDev/Desktop/MapViewer/MgSearchControlImpl.resx	2012-10-03 14:52:57 UTC (rev 7067)
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="lblPrompt.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
+  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="lblPrompt.Location" type="System.Drawing.Point, System.Drawing">
+    <value>13, 21</value>
+  </data>
+  <data name="lblPrompt.Size" type="System.Drawing.Size, System.Drawing">
+    <value>184, 45</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="lblPrompt.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name=">>lblPrompt.Name" xml:space="preserve">
+    <value>lblPrompt</value>
+  </data>
+  <data name=">>lblPrompt.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>lblPrompt.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name=">>lblPrompt.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="txtSearch.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
+  </data>
+  <data name="txtSearch.Location" type="System.Drawing.Point, System.Drawing">
+    <value>16, 81</value>
+  </data>
+  <data name="txtSearch.Size" type="System.Drawing.Size, System.Drawing">
+    <value>181, 20</value>
+  </data>
+  <data name="txtSearch.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name=">>txtSearch.Name" xml:space="preserve">
+    <value>txtSearch</value>
+  </data>
+  <data name=">>txtSearch.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>txtSearch.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name=">>txtSearch.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="btnSearch.Location" type="System.Drawing.Point, System.Drawing">
+    <value>16, 108</value>
+  </data>
+  <data name="btnSearch.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
+  </data>
+  <data name="btnSearch.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="btnSearch.Text" xml:space="preserve">
+    <value>Search</value>
+  </data>
+  <data name=">>btnSearch.Name" xml:space="preserve">
+    <value>btnSearch</value>
+  </data>
+  <data name=">>btnSearch.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name=">>btnSearch.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name=">>btnSearch.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 13</value>
+  </data>
+  <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
+    <value>215, 144</value>
+  </data>
+  <data name=">>$this.Name" xml:space="preserve">
+    <value>MgSearchControlImpl</value>
+  </data>
+  <data name=">>$this.Type" xml:space="preserve">
+    <value>OSGeo.MapGuide.Viewer.MgControlView, OSGeo.MapGuide.Viewer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e75f9fd7cf82dc3f</value>
+  </data>
+</root>
\ No newline at end of file

Modified: branches/2.4/MgDev/Desktop/MapViewer/Strings.Designer.cs
===================================================================
--- branches/2.4/MgDev/Desktop/MapViewer/Strings.Designer.cs	2012-10-03 14:07:01 UTC (rev 7066)
+++ branches/2.4/MgDev/Desktop/MapViewer/Strings.Designer.cs	2012-10-03 14:52:57 UTC (rev 7067)
@@ -178,6 +178,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Invalid search layer. Layer {0} not found on map.
+        /// </summary>
+        internal static string ErrorInvalidSearchLayer {
+            get {
+                return ResourceManager.GetString("ErrorInvalidSearchLayer", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Layer metadata not fully initialized.
         /// </summary>
         internal static string ErrorLayerMetadataNotFullyInitialized {
@@ -214,6 +223,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to The search filter is missing the required $USER_VARIABLE placeholder.
+        /// </summary>
+        internal static string ErrorSearchFilterMissingPlaceholder {
+            get {
+                return ResourceManager.GetString("ErrorSearchFilterMissingPlaceholder", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to The stream is not rewindable.
         /// </summary>
         internal static string ErrorStreamNotRewindable {
@@ -511,6 +529,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Enter Search Criteria.
+        /// </summary>
+        internal static string TextEnterSearchCriteria {
+            get {
+                return ResourceManager.GetString("TextEnterSearchCriteria", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Exit.
         /// </summary>
         internal static string TextExitApplication {
@@ -817,6 +844,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Search.
+        /// </summary>
+        internal static string TitleSearch {
+            get {
+                return ResourceManager.GetString("TitleSearch", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to About the Task Pane.
         /// </summary>
         internal static string TitleTaskPaneAbout {

Modified: branches/2.4/MgDev/Desktop/MapViewer/Strings.resx
===================================================================
--- branches/2.4/MgDev/Desktop/MapViewer/Strings.resx	2012-10-03 14:07:01 UTC (rev 7066)
+++ branches/2.4/MgDev/Desktop/MapViewer/Strings.resx	2012-10-03 14:52:57 UTC (rev 7067)
@@ -390,4 +390,16 @@
   <data name="SetLanguage" xml:space="preserve">
     <value>Set Language</value>
   </data>
+  <data name="ErrorSearchFilterMissingPlaceholder" xml:space="preserve">
+    <value>The search filter is missing the required $USER_VARIABLE placeholder</value>
+  </data>
+  <data name="ErrorInvalidSearchLayer" xml:space="preserve">
+    <value>Invalid search layer. Layer {0} not found on map</value>
+  </data>
+  <data name="TextEnterSearchCriteria" xml:space="preserve">
+    <value>Enter Search Criteria</value>
+  </data>
+  <data name="TitleSearch" xml:space="preserve">
+    <value>Search</value>
+  </data>
 </root>
\ No newline at end of file

Modified: branches/2.4/MgDev/Desktop/MgAppLayout/Sheboygan.AppLayout
===================================================================
--- branches/2.4/MgDev/Desktop/MgAppLayout/Sheboygan.AppLayout	2012-10-03 14:07:01 UTC (rev 7066)
+++ branches/2.4/MgDev/Desktop/MgAppLayout/Sheboygan.AppLayout	2012-10-03 14:52:57 UTC (rev 7067)
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <AppLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Title>MapGuide Desktop App Layout Example</Title>
+  <Title>MapGuide Desktop App Layout Example (Untiled)</Title>
   <Icon>app.ico</Icon>
   <Settings>
     <NameValue>
@@ -92,6 +92,11 @@
           </ItemBase>
           <ItemBase xsi:type="SeparatorItem" />
           <ItemBase xsi:type="CommandItem">
+            <ComponentID>SearchParcelsByName</ComponentID>
+            <ShowLabel>false</ShowLabel>
+          </ItemBase>
+          <ItemBase xsi:type="SeparatorItem" />
+          <ItemBase xsi:type="CommandItem">
             <ComponentID>ViewerOptions</ComponentID>
             <ShowLabel>false</ShowLabel>
           </ItemBase>
@@ -185,6 +190,11 @@
           </ItemBase>
           <ItemBase xsi:type="SeparatorItem" />
           <ItemBase xsi:type="CommandItem">
+            <ComponentID>SearchParcelsByName</ComponentID>
+            <ShowLabel>false</ShowLabel>
+          </ItemBase>
+          <ItemBase xsi:type="SeparatorItem" />
+          <ItemBase xsi:type="CommandItem">
             <ComponentID>ViewerOptions</ComponentID>
             <ShowLabel>false</ShowLabel>
           </ItemBase>
@@ -248,6 +258,11 @@
             <ComponentID>Theme</ComponentID>
             <ShowLabel>false</ShowLabel>
           </ItemBase>
+          <ItemBase xsi:type="SeparatorItem" />
+          <ItemBase xsi:type="CommandItem">
+            <ComponentID>SearchParcelsByName</ComponentID>
+            <ShowLabel>false</ShowLabel>
+          </ItemBase>
         </Items>
       </ItemBase>
       <ItemBase xsi:type="SeparatorItem" />
@@ -277,6 +292,11 @@
           <ComponentID>Theme</ComponentID>
           <ShowLabel>false</ShowLabel>
         </ItemBase>
+        <ItemBase xsi:type="SeparatorItem" />
+        <ItemBase xsi:type="CommandItem">
+          <ComponentID>SearchParcelsByName</ComponentID>
+          <ShowLabel>false</ShowLabel>
+        </ItemBase>
       </Items>
     </TaskMenu>
   </TaskPane>
@@ -404,6 +424,40 @@
       <ClassName>OSGeo.MapGuide.Viewer.MgSelectComponent</ClassName>
     </ComponentDefinition>
     <ComponentDefinition>
+      <ComponentID>SearchParcelsByName</ComponentID>
+      <ClassName>OSGeo.MapGuide.Viewer.MgSearchComponent</ClassName>
+      <Properties>
+        <NameValue>
+          <Name>Label</Name>
+          <Value>Search Parcels by Owner</Value>
+        </NameValue>
+        <NameValue>
+          <Name>Title</Name>
+          <Value>Search Parcels by Owner</Value>
+        </NameValue>
+        <NameValue>
+          <Name>LayerName</Name>
+          <Value>Parcels</Value>
+        </NameValue>
+        <NameValue>
+          <Name>Prompt</Name>
+          <Value>Enter the owner's name (eg. Schmitt)</Value>
+        </NameValue>
+        <NameValue>
+          <Name>Filter</Name>
+          <Value>RNAME LIKE '$USER_VARIABLE%'</Value>
+        </NameValue>
+        <NameValue>
+          <Name>Target</Name>
+          <Value>enum:OSGeo.MapGuide.Viewer.MgViewerTarget:TaskPane</Value>
+        </NameValue>
+        <NameValue>
+          <Name>TaskPane</Name>
+          <Value>taskpane:</Value>
+        </NameValue>
+      </Properties>
+    </ComponentDefinition>
+    <ComponentDefinition>
       <ComponentID>Theme</ComponentID>
       <ClassName>OSGeo.MapGuide.Viewer.MgThemeComponent</ClassName>
       <Properties>

Modified: branches/2.4/MgDev/Desktop/MgAppLayout/SheboyganTiled.AppLayout
===================================================================
--- branches/2.4/MgDev/Desktop/MgAppLayout/SheboyganTiled.AppLayout	2012-10-03 14:07:01 UTC (rev 7066)
+++ branches/2.4/MgDev/Desktop/MgAppLayout/SheboyganTiled.AppLayout	2012-10-03 14:52:57 UTC (rev 7067)
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <AppLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Title>MapGuide Desktop App Layout Example</Title>
+  <Title>MapGuide Desktop App Layout Example (Tiled Map)</Title>
   <Icon>app.ico</Icon>
   <Settings>
     <NameValue>
@@ -92,6 +92,11 @@
           </ItemBase>
           <ItemBase xsi:type="SeparatorItem" />
           <ItemBase xsi:type="CommandItem">
+            <ComponentID>SearchParcelsByName</ComponentID>
+            <ShowLabel>false</ShowLabel>
+          </ItemBase>
+          <ItemBase xsi:type="SeparatorItem" />
+          <ItemBase xsi:type="CommandItem">
             <ComponentID>ViewerOptions</ComponentID>
             <ShowLabel>false</ShowLabel>
           </ItemBase>
@@ -185,6 +190,11 @@
           </ItemBase>
           <ItemBase xsi:type="SeparatorItem" />
           <ItemBase xsi:type="CommandItem">
+            <ComponentID>SearchParcelsByName</ComponentID>
+            <ShowLabel>false</ShowLabel>
+          </ItemBase>
+          <ItemBase xsi:type="SeparatorItem" />
+          <ItemBase xsi:type="CommandItem">
             <ComponentID>ViewerOptions</ComponentID>
             <ShowLabel>false</ShowLabel>
           </ItemBase>
@@ -248,6 +258,11 @@
             <ComponentID>Theme</ComponentID>
             <ShowLabel>false</ShowLabel>
           </ItemBase>
+          <ItemBase xsi:type="SeparatorItem" />
+          <ItemBase xsi:type="CommandItem">
+            <ComponentID>SearchParcelsByName</ComponentID>
+            <ShowLabel>false</ShowLabel>
+          </ItemBase>
         </Items>
       </ItemBase>
       <ItemBase xsi:type="SeparatorItem" />
@@ -277,6 +292,11 @@
           <ComponentID>Theme</ComponentID>
           <ShowLabel>false</ShowLabel>
         </ItemBase>
+        <ItemBase xsi:type="SeparatorItem" />
+        <ItemBase xsi:type="CommandItem">
+          <ComponentID>SearchParcelsByName</ComponentID>
+          <ShowLabel>false</ShowLabel>
+        </ItemBase>
       </Items>
     </TaskMenu>
   </TaskPane>
@@ -404,6 +424,40 @@
       <ClassName>OSGeo.MapGuide.Viewer.MgSelectComponent</ClassName>
     </ComponentDefinition>
     <ComponentDefinition>
+      <ComponentID>SearchParcelsByName</ComponentID>
+      <ClassName>OSGeo.MapGuide.Viewer.MgSearchComponent</ClassName>
+      <Properties>
+        <NameValue>
+          <Name>Label</Name>
+          <Value>Search Parcels by Owner</Value>
+        </NameValue>
+        <NameValue>
+          <Name>Title</Name>
+          <Value>Search Parcels by Owner</Value>
+        </NameValue>
+        <NameValue>
+          <Name>LayerName</Name>
+          <Value>Parcels</Value>
+        </NameValue>
+        <NameValue>
+          <Name>Prompt</Name>
+          <Value>Enter the owner's name (eg. Schmitt)</Value>
+        </NameValue>
+        <NameValue>
+          <Name>Filter</Name>
+          <Value>RNAME LIKE '$USER_VARIABLE%'</Value>
+        </NameValue>
+        <NameValue>
+          <Name>Target</Name>
+          <Value>enum:OSGeo.MapGuide.Viewer.MgViewerTarget:TaskPane</Value>
+        </NameValue>
+        <NameValue>
+          <Name>TaskPane</Name>
+          <Value>taskpane:</Value>
+        </NameValue>
+      </Properties>
+    </ComponentDefinition>
+    <ComponentDefinition>
       <ComponentID>Theme</ComponentID>
       <ClassName>OSGeo.MapGuide.Viewer.MgThemeComponent</ClassName>
       <Properties>



More information about the mapguide-commits mailing list