[mapguide-commits] r4200 - in trunk/Tools/Maestro:
Maestro/ResourceEditors
Maestro/ResourceEditors/LayoutControls MaestroAPI/Generated
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sun Aug 30 09:19:00 EDT 2009
Author: ksgeograf
Date: 2009-08-30 09:18:59 -0400 (Sun, 30 Aug 2009)
New Revision: 4200
Modified:
trunk/Tools/Maestro/Maestro/ResourceEditors/LayoutControls/InvokeURL.cs
trunk/Tools/Maestro/Maestro/ResourceEditors/LayoutControls/SearchCommand.cs
trunk/Tools/Maestro/Maestro/ResourceEditors/LayoutControls/SearchCommand.resx
trunk/Tools/Maestro/Maestro/ResourceEditors/ThemeCreator.cs
trunk/Tools/Maestro/MaestroAPI/Generated/WebLayout-1.0.0.cs
Log:
Maestro: Fixed a number of issues with the SearchCommand control for WebLayouts.
Fixed a missing change for the previous commit.
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/LayoutControls/InvokeURL.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/LayoutControls/InvokeURL.cs 2009-08-30 11:17:41 UTC (rev 4199)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/LayoutControls/InvokeURL.cs 2009-08-30 13:18:59 UTC (rev 4200)
@@ -82,9 +82,9 @@
string keycol = m_layoutEditor.Globalizor.Translate("OSGeo.MapGuide.Maestro.ResourceEditors.LayoutEditor.commandEditor.invokeURL.KeyColumnStyle.HeaderText");
string valuecol = m_layoutEditor.Globalizor.Translate("OSGeo.MapGuide.Maestro.ResourceEditors.LayoutEditor.commandEditor.invokeURL.ValueColumnStyle.HeaderText");
- if (keycol != null)
+ if (keycol != null && !keycol.EndsWith(".HeaderText"))
KeyColumnStyle.HeaderText = keycol;
- if (valuecol != null)
+ if (valuecol != null && !keycol.EndsWith(".HeaderText"))
ValueColumnStyle.HeaderText = valuecol;
UpdateDisplay();
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/LayoutControls/SearchCommand.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/LayoutControls/SearchCommand.cs 2009-08-30 11:17:41 UTC (rev 4199)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/LayoutControls/SearchCommand.cs 2009-08-30 13:18:59 UTC (rev 4200)
@@ -23,6 +23,7 @@
using System.Drawing;
using System.Data;
using System.Windows.Forms;
+using System.Collections.Generic;
namespace OSGeo.MapGuide.Maestro.ResourceEditors.LayoutControls
{
@@ -36,14 +37,11 @@
private System.Windows.Forms.ComboBox Target;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label3;
- private System.Windows.Forms.TextBox Prompt;
- private System.Windows.Forms.Button BrowseLayers;
- private System.Windows.Forms.TextBox Layer;
+ private System.Windows.Forms.TextBox Prompt;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.TextBox Filter;
- private System.Windows.Forms.Button BuildFilter;
- private System.Windows.Forms.TextBox ResultLimit;
+ private System.Windows.Forms.Button BuildFilter;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.DataGrid resultColumns;
private System.Windows.Forms.Label label7;
@@ -64,7 +62,10 @@
private LayoutEditor m_layoutEditor = null;
private System.Windows.Forms.DataGridTextBoxColumn CaptionColumnStyle;
private System.Windows.Forms.DataGridTextBoxColumn PropertyColumnStyle;
+ private NumericUpDown ResultLimit;
+ private ComboBox Layer;
private bool m_hasChanged = false;
+ private List<MaestroAPI.MapLayerType> m_layerList;
public SearchCommand()
{
@@ -87,11 +88,33 @@
string capcol = m_layoutEditor.Globalizor.Translate("OSGeo.MapGuide.Maestro.ResourceEditors.LayoutEditor.commandEditor.searchCommand.CaptionColumnStyle.HeaderText");
string propcol = m_layoutEditor.Globalizor.Translate("OSGeo.MapGuide.Maestro.ResourceEditors.LayoutEditor.commandEditor.searchCommand.PropertyColumnStyle.HeaderText");
- if (capcol != null)
+ if (capcol != null && !capcol.EndsWith(".HeaderText"))
CaptionColumnStyle.HeaderText = capcol;
- if (propcol != null)
+ if (propcol != null && !propcol.EndsWith(".HeaderText"))
PropertyColumnStyle.HeaderText = propcol;
+ try
+ {
+ m_isUpdating = true;
+ Layer.Items.Clear();
+ m_layerList = new List<MaestroAPI.MapLayerType>();
+ MaestroAPI.MapDefinition mdef = m_layout.CurrentConnection.GetMapDefinition(m_layout.Map.ResourceId);
+ foreach (MaestroAPI.MapLayerType l in mdef.Layers)
+ m_layerList.Add(l);
+ if (mdef.BaseMapDefinition != null && mdef.BaseMapDefinition.BaseMapLayerGroup != null)
+ foreach (MaestroAPI.BaseMapLayerGroupCommonType g in mdef.BaseMapDefinition.BaseMapLayerGroup)
+ foreach (MaestroAPI.MapLayerType l in g.BaseMapLayer)
+ m_layerList.Add(l);
+ }
+ catch { }
+ finally
+ {
+ foreach (MaestroAPI.MapLayerType l in m_layerList)
+ Layer.Items.Add(l.Name);
+
+ m_isUpdating = false;
+ }
+
UpdateDisplay();
}
@@ -110,9 +133,9 @@
Target.SelectedIndex = Target.FindString(m_command.Target.ToString());
TargetFrame.Text = m_command.TargetFrame;
Prompt.Text = m_command.Prompt;
- Layer.Text = m_command.Layer;
+ Layer.SelectedIndex = Layer.FindString(m_command.Layer);
Filter.Text = m_command.Filter;
- ResultLimit.Text = m_command.MatchLimit;
+ ResultLimit.Value = Math.Min(Math.Max(m_command.MatchLimit, ResultLimit.Minimum), ResultLimit.Maximum);
ResultTable.Rows.Clear();
if (m_command.ResultColumns != null)
foreach(OSGeo.MapGuide.MaestroAPI.ResultColumnType rs in m_command.ResultColumns)
@@ -147,271 +170,266 @@
/// </summary>
private void InitializeComponent()
{
- this.TargetFrame = new System.Windows.Forms.TextBox();
- this.label2 = new System.Windows.Forms.Label();
- this.Target = new System.Windows.Forms.ComboBox();
- this.label1 = new System.Windows.Forms.Label();
- this.label3 = new System.Windows.Forms.Label();
- this.Prompt = new System.Windows.Forms.TextBox();
- this.BrowseLayers = new System.Windows.Forms.Button();
- this.Layer = new System.Windows.Forms.TextBox();
- this.label4 = new System.Windows.Forms.Label();
- this.label5 = new System.Windows.Forms.Label();
- this.Filter = new System.Windows.Forms.TextBox();
- this.BuildFilter = new System.Windows.Forms.Button();
- this.ResultLimit = new System.Windows.Forms.TextBox();
- this.label6 = new System.Windows.Forms.Label();
- this.resultColumns = new System.Windows.Forms.DataGrid();
- this.ResultTable = new System.Data.DataTable();
- this.dataColumn1 = new System.Data.DataColumn();
- this.dataColumn2 = new System.Data.DataColumn();
- this.dataGridTableStyle1 = new System.Windows.Forms.DataGridTableStyle();
- this.CaptionColumnStyle = new System.Windows.Forms.DataGridTextBoxColumn();
- this.PropertyColumnStyle = new System.Windows.Forms.DataGridTextBoxColumn();
- this.label7 = new System.Windows.Forms.Label();
- this.dataSet = new System.Data.DataSet();
- ((System.ComponentModel.ISupportInitialize)(this.resultColumns)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.ResultTable)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.dataSet)).BeginInit();
- this.SuspendLayout();
- //
- // TargetFrame
- //
- this.TargetFrame.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.TargetFrame.Location = new System.Drawing.Point(96, 40);
- this.TargetFrame.Name = "TargetFrame";
- this.TargetFrame.Size = new System.Drawing.Size(88, 20);
- this.TargetFrame.TabIndex = 32;
- this.TargetFrame.Text = "";
- this.TargetFrame.TextChanged += new System.EventHandler(this.SomeProperty_Changed);
- //
- // label2
- //
- this.label2.FlatStyle = System.Windows.Forms.FlatStyle.System;
- this.label2.Location = new System.Drawing.Point(8, 40);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(80, 16);
- this.label2.TabIndex = 31;
- this.label2.Text = "Frame";
- //
- // Target
- //
- this.Target.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.Target.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.Target.Location = new System.Drawing.Point(96, 8);
- this.Target.Name = "Target";
- this.Target.Size = new System.Drawing.Size(88, 21);
- this.Target.TabIndex = 30;
- this.Target.TextChanged += new System.EventHandler(this.SomeProperty_Changed);
- //
- // label1
- //
- this.label1.FlatStyle = System.Windows.Forms.FlatStyle.System;
- this.label1.Location = new System.Drawing.Point(8, 8);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(80, 16);
- this.label1.TabIndex = 29;
- this.label1.Text = "Target";
- //
- // label3
- //
- this.label3.Location = new System.Drawing.Point(8, 72);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(80, 16);
- this.label3.TabIndex = 33;
- this.label3.Text = "Prompt";
- //
- // Prompt
- //
- this.Prompt.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.Prompt.Location = new System.Drawing.Point(8, 88);
- this.Prompt.Multiline = true;
- this.Prompt.Name = "Prompt";
- this.Prompt.Size = new System.Drawing.Size(176, 88);
- this.Prompt.TabIndex = 34;
- this.Prompt.Text = "";
- this.Prompt.TextChanged += new System.EventHandler(this.SomeProperty_Changed);
- //
- // BrowseLayers
- //
- this.BrowseLayers.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.BrowseLayers.Location = new System.Drawing.Point(160, 184);
- this.BrowseLayers.Name = "BrowseLayers";
- this.BrowseLayers.Size = new System.Drawing.Size(24, 20);
- this.BrowseLayers.TabIndex = 43;
- this.BrowseLayers.Text = "...";
- this.BrowseLayers.Click += new System.EventHandler(this.BrowseLayers_Click);
- //
- // Layer
- //
- this.Layer.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.Layer.Location = new System.Drawing.Point(96, 184);
- this.Layer.Name = "Layer";
- this.Layer.Size = new System.Drawing.Size(56, 20);
- this.Layer.TabIndex = 45;
- this.Layer.Text = "";
- this.Layer.TextChanged += new System.EventHandler(this.SomeProperty_Changed);
- //
- // label4
- //
- this.label4.FlatStyle = System.Windows.Forms.FlatStyle.System;
- this.label4.Location = new System.Drawing.Point(8, 184);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(80, 16);
- this.label4.TabIndex = 44;
- this.label4.Text = "Layer";
- //
- // label5
- //
- this.label5.Location = new System.Drawing.Point(8, 208);
- this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(80, 16);
- this.label5.TabIndex = 46;
- this.label5.Text = "Filter";
- //
- // Filter
- //
- this.Filter.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.Filter.Location = new System.Drawing.Point(96, 208);
- this.Filter.Name = "Filter";
- this.Filter.Size = new System.Drawing.Size(56, 20);
- this.Filter.TabIndex = 47;
- this.Filter.Text = "";
- this.Filter.TextChanged += new System.EventHandler(this.SomeProperty_Changed);
- //
- // BuildFilter
- //
- this.BuildFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.BuildFilter.Location = new System.Drawing.Point(160, 208);
- this.BuildFilter.Name = "BuildFilter";
- this.BuildFilter.Size = new System.Drawing.Size(24, 20);
- this.BuildFilter.TabIndex = 48;
- this.BuildFilter.Text = "...";
- this.BuildFilter.Click += new System.EventHandler(this.BuildFilter_Click);
- //
- // ResultLimit
- //
- this.ResultLimit.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.ResultLimit.Location = new System.Drawing.Point(96, 232);
- this.ResultLimit.Name = "ResultLimit";
- this.ResultLimit.Size = new System.Drawing.Size(88, 20);
- this.ResultLimit.TabIndex = 50;
- this.ResultLimit.Text = "";
- this.ResultLimit.TextChanged += new System.EventHandler(this.SomeProperty_Changed);
- //
- // label6
- //
- this.label6.FlatStyle = System.Windows.Forms.FlatStyle.System;
- this.label6.Location = new System.Drawing.Point(8, 232);
- this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(80, 16);
- this.label6.TabIndex = 49;
- this.label6.Text = "Result limit";
- //
- // resultColumns
- //
- this.resultColumns.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.resultColumns.CaptionVisible = false;
- this.resultColumns.DataMember = "";
- this.resultColumns.DataSource = this.ResultTable;
- this.resultColumns.HeaderForeColor = System.Drawing.SystemColors.ControlText;
- this.resultColumns.Location = new System.Drawing.Point(8, 288);
- this.resultColumns.Name = "resultColumns";
- this.resultColumns.Size = new System.Drawing.Size(176, 112);
- this.resultColumns.TabIndex = 51;
- this.resultColumns.TableStyles.AddRange(new System.Windows.Forms.DataGridTableStyle[] {
- this.dataGridTableStyle1});
- this.resultColumns.Leave += new System.EventHandler(this.resultColumns_Leave);
- //
- // ResultTable
- //
- this.ResultTable.Columns.AddRange(new System.Data.DataColumn[] {
- this.dataColumn1,
- this.dataColumn2});
- this.ResultTable.TableName = "ResultTable";
- //
- // dataColumn1
- //
- this.dataColumn1.ColumnName = "CaptionColumn";
- //
- // dataColumn2
- //
- this.dataColumn2.ColumnName = "PropertyColumn";
- //
- // dataGridTableStyle1
- //
- this.dataGridTableStyle1.DataGrid = this.resultColumns;
- this.dataGridTableStyle1.GridColumnStyles.AddRange(new System.Windows.Forms.DataGridColumnStyle[] {
- this.CaptionColumnStyle,
- this.PropertyColumnStyle});
- this.dataGridTableStyle1.HeaderForeColor = System.Drawing.SystemColors.ControlText;
- this.dataGridTableStyle1.MappingName = "ResultTable";
- //
- // CaptionColumnStyle
- //
- this.CaptionColumnStyle.Format = "";
- this.CaptionColumnStyle.FormatInfo = null;
- this.CaptionColumnStyle.HeaderText = "Caption";
- this.CaptionColumnStyle.MappingName = "CaptionColumn";
- this.CaptionColumnStyle.Width = 75;
- //
- // PropertyColumnStyle
- //
- this.PropertyColumnStyle.Format = "";
- this.PropertyColumnStyle.FormatInfo = null;
- this.PropertyColumnStyle.HeaderText = "Property";
- this.PropertyColumnStyle.MappingName = "PropertyColumn";
- this.PropertyColumnStyle.Width = 150;
- //
- // label7
- //
- this.label7.Location = new System.Drawing.Point(8, 272);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(176, 16);
- this.label7.TabIndex = 52;
- this.label7.Text = "Result columns";
- //
- // dataSet
- //
- this.dataSet.DataSetName = "NewDataSet";
- this.dataSet.Locale = new System.Globalization.CultureInfo("da-DK");
- this.dataSet.Tables.AddRange(new System.Data.DataTable[] {
- this.ResultTable});
- //
- // SearchCommand
- //
- this.AutoScroll = true;
- this.AutoScrollMinSize = new System.Drawing.Size(192, 408);
- this.Controls.Add(this.label7);
- this.Controls.Add(this.resultColumns);
- this.Controls.Add(this.ResultLimit);
- this.Controls.Add(this.label6);
- this.Controls.Add(this.BuildFilter);
- this.Controls.Add(this.Filter);
- this.Controls.Add(this.label5);
- this.Controls.Add(this.Layer);
- this.Controls.Add(this.label4);
- this.Controls.Add(this.BrowseLayers);
- this.Controls.Add(this.Prompt);
- this.Controls.Add(this.label3);
- this.Controls.Add(this.TargetFrame);
- this.Controls.Add(this.label2);
- this.Controls.Add(this.Target);
- this.Controls.Add(this.label1);
- this.Name = "SearchCommand";
- this.Size = new System.Drawing.Size(192, 408);
- ((System.ComponentModel.ISupportInitialize)(this.resultColumns)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.ResultTable)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.dataSet)).EndInit();
- this.ResumeLayout(false);
+ this.TargetFrame = new System.Windows.Forms.TextBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.Target = new System.Windows.Forms.ComboBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.Prompt = new System.Windows.Forms.TextBox();
+ this.label4 = new System.Windows.Forms.Label();
+ this.label5 = new System.Windows.Forms.Label();
+ this.Filter = new System.Windows.Forms.TextBox();
+ this.BuildFilter = new System.Windows.Forms.Button();
+ this.label6 = new System.Windows.Forms.Label();
+ this.resultColumns = new System.Windows.Forms.DataGrid();
+ this.ResultTable = new System.Data.DataTable();
+ this.dataColumn1 = new System.Data.DataColumn();
+ this.dataColumn2 = new System.Data.DataColumn();
+ this.dataGridTableStyle1 = new System.Windows.Forms.DataGridTableStyle();
+ this.CaptionColumnStyle = new System.Windows.Forms.DataGridTextBoxColumn();
+ this.PropertyColumnStyle = new System.Windows.Forms.DataGridTextBoxColumn();
+ this.label7 = new System.Windows.Forms.Label();
+ this.dataSet = new System.Data.DataSet();
+ this.ResultLimit = new System.Windows.Forms.NumericUpDown();
+ this.Layer = new System.Windows.Forms.ComboBox();
+ ((System.ComponentModel.ISupportInitialize)(this.resultColumns)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.ResultTable)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.dataSet)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.ResultLimit)).BeginInit();
+ this.SuspendLayout();
+ //
+ // TargetFrame
+ //
+ this.TargetFrame.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.TargetFrame.Location = new System.Drawing.Point(96, 40);
+ this.TargetFrame.Name = "TargetFrame";
+ this.TargetFrame.Size = new System.Drawing.Size(88, 20);
+ this.TargetFrame.TabIndex = 32;
+ this.TargetFrame.TextChanged += new System.EventHandler(this.SomeProperty_Changed);
+ //
+ // label2
+ //
+ this.label2.FlatStyle = System.Windows.Forms.FlatStyle.System;
+ this.label2.Location = new System.Drawing.Point(8, 40);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(80, 16);
+ this.label2.TabIndex = 31;
+ this.label2.Text = "Frame";
+ //
+ // Target
+ //
+ this.Target.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.Target.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.Target.Location = new System.Drawing.Point(96, 8);
+ this.Target.Name = "Target";
+ this.Target.Size = new System.Drawing.Size(88, 21);
+ this.Target.TabIndex = 30;
+ this.Target.SelectedIndexChanged += new System.EventHandler(this.SomeProperty_Changed);
+ this.Target.TextChanged += new System.EventHandler(this.SomeProperty_Changed);
+ //
+ // label1
+ //
+ this.label1.FlatStyle = System.Windows.Forms.FlatStyle.System;
+ this.label1.Location = new System.Drawing.Point(8, 8);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(80, 16);
+ this.label1.TabIndex = 29;
+ this.label1.Text = "Target";
+ //
+ // label3
+ //
+ this.label3.Location = new System.Drawing.Point(8, 72);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(80, 16);
+ this.label3.TabIndex = 33;
+ this.label3.Text = "Prompt";
+ //
+ // Prompt
+ //
+ this.Prompt.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.Prompt.Location = new System.Drawing.Point(8, 88);
+ this.Prompt.Multiline = true;
+ this.Prompt.Name = "Prompt";
+ this.Prompt.Size = new System.Drawing.Size(176, 88);
+ this.Prompt.TabIndex = 34;
+ this.Prompt.TextChanged += new System.EventHandler(this.SomeProperty_Changed);
+ //
+ // label4
+ //
+ this.label4.FlatStyle = System.Windows.Forms.FlatStyle.System;
+ this.label4.Location = new System.Drawing.Point(8, 184);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(80, 16);
+ this.label4.TabIndex = 44;
+ this.label4.Text = "Layer";
+ //
+ // label5
+ //
+ this.label5.Location = new System.Drawing.Point(8, 208);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(80, 16);
+ this.label5.TabIndex = 46;
+ this.label5.Text = "Filter";
+ //
+ // Filter
+ //
+ this.Filter.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.Filter.Location = new System.Drawing.Point(96, 208);
+ this.Filter.Name = "Filter";
+ this.Filter.Size = new System.Drawing.Size(56, 20);
+ this.Filter.TabIndex = 47;
+ this.Filter.TextChanged += new System.EventHandler(this.SomeProperty_Changed);
+ //
+ // BuildFilter
+ //
+ this.BuildFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.BuildFilter.Location = new System.Drawing.Point(160, 208);
+ this.BuildFilter.Name = "BuildFilter";
+ this.BuildFilter.Size = new System.Drawing.Size(24, 20);
+ this.BuildFilter.TabIndex = 48;
+ this.BuildFilter.Text = "...";
+ this.BuildFilter.Click += new System.EventHandler(this.BuildFilter_Click);
+ //
+ // label6
+ //
+ this.label6.FlatStyle = System.Windows.Forms.FlatStyle.System;
+ this.label6.Location = new System.Drawing.Point(8, 232);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(80, 16);
+ this.label6.TabIndex = 49;
+ this.label6.Text = "Result limit";
+ //
+ // resultColumns
+ //
+ this.resultColumns.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.resultColumns.CaptionVisible = false;
+ this.resultColumns.DataMember = "";
+ this.resultColumns.DataSource = this.ResultTable;
+ this.resultColumns.HeaderForeColor = System.Drawing.SystemColors.ControlText;
+ this.resultColumns.Location = new System.Drawing.Point(8, 288);
+ this.resultColumns.Name = "resultColumns";
+ this.resultColumns.Size = new System.Drawing.Size(176, 112);
+ this.resultColumns.TabIndex = 51;
+ this.resultColumns.TableStyles.AddRange(new System.Windows.Forms.DataGridTableStyle[] {
+ this.dataGridTableStyle1});
+ this.resultColumns.Leave += new System.EventHandler(this.resultColumns_Leave);
+ //
+ // ResultTable
+ //
+ this.ResultTable.Columns.AddRange(new System.Data.DataColumn[] {
+ this.dataColumn1,
+ this.dataColumn2});
+ this.ResultTable.TableName = "ResultTable";
+ //
+ // dataColumn1
+ //
+ this.dataColumn1.ColumnName = "CaptionColumn";
+ //
+ // dataColumn2
+ //
+ this.dataColumn2.ColumnName = "PropertyColumn";
+ //
+ // dataGridTableStyle1
+ //
+ this.dataGridTableStyle1.DataGrid = this.resultColumns;
+ this.dataGridTableStyle1.GridColumnStyles.AddRange(new System.Windows.Forms.DataGridColumnStyle[] {
+ this.CaptionColumnStyle,
+ this.PropertyColumnStyle});
+ this.dataGridTableStyle1.HeaderForeColor = System.Drawing.SystemColors.ControlText;
+ this.dataGridTableStyle1.MappingName = "ResultTable";
+ //
+ // CaptionColumnStyle
+ //
+ this.CaptionColumnStyle.Format = "";
+ this.CaptionColumnStyle.FormatInfo = null;
+ this.CaptionColumnStyle.HeaderText = "Caption";
+ this.CaptionColumnStyle.MappingName = "CaptionColumn";
+ this.CaptionColumnStyle.Width = 75;
+ //
+ // PropertyColumnStyle
+ //
+ this.PropertyColumnStyle.Format = "";
+ this.PropertyColumnStyle.FormatInfo = null;
+ this.PropertyColumnStyle.HeaderText = "Property";
+ this.PropertyColumnStyle.MappingName = "PropertyColumn";
+ this.PropertyColumnStyle.Width = 150;
+ //
+ // label7
+ //
+ this.label7.Location = new System.Drawing.Point(8, 272);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(176, 16);
+ this.label7.TabIndex = 52;
+ this.label7.Text = "Result columns";
+ //
+ // dataSet
+ //
+ this.dataSet.DataSetName = "NewDataSet";
+ this.dataSet.Locale = new System.Globalization.CultureInfo("da-DK");
+ this.dataSet.Tables.AddRange(new System.Data.DataTable[] {
+ this.ResultTable});
+ //
+ // ResultLimit
+ //
+ this.ResultLimit.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.ResultLimit.Location = new System.Drawing.Point(96, 232);
+ this.ResultLimit.Maximum = new decimal(new int[] {
+ 1000,
+ 0,
+ 0,
+ 0});
+ this.ResultLimit.Name = "ResultLimit";
+ this.ResultLimit.Size = new System.Drawing.Size(88, 20);
+ this.ResultLimit.TabIndex = 53;
+ this.ResultLimit.ValueChanged += new System.EventHandler(this.SomeProperty_Changed);
+ //
+ // Layer
+ //
+ this.Layer.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.Layer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.Layer.FormattingEnabled = true;
+ this.Layer.Location = new System.Drawing.Point(96, 184);
+ this.Layer.Name = "Layer";
+ this.Layer.Size = new System.Drawing.Size(88, 21);
+ this.Layer.TabIndex = 54;
+ this.Layer.SelectedIndexChanged += new System.EventHandler(this.SomeProperty_Changed);
+ this.Layer.TextChanged += new System.EventHandler(this.SomeProperty_Changed);
+ //
+ // SearchCommand
+ //
+ this.AutoScroll = true;
+ this.AutoScrollMinSize = new System.Drawing.Size(192, 408);
+ this.Controls.Add(this.Layer);
+ this.Controls.Add(this.ResultLimit);
+ this.Controls.Add(this.label7);
+ this.Controls.Add(this.resultColumns);
+ this.Controls.Add(this.label6);
+ this.Controls.Add(this.BuildFilter);
+ this.Controls.Add(this.Filter);
+ this.Controls.Add(this.label5);
+ this.Controls.Add(this.label4);
+ this.Controls.Add(this.Prompt);
+ this.Controls.Add(this.label3);
+ this.Controls.Add(this.TargetFrame);
+ this.Controls.Add(this.label2);
+ this.Controls.Add(this.Target);
+ this.Controls.Add(this.label1);
+ this.Name = "SearchCommand";
+ this.Size = new System.Drawing.Size(192, 408);
+ ((System.ComponentModel.ISupportInitialize)(this.resultColumns)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.ResultTable)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.dataSet)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.ResultLimit)).EndInit();
+ this.ResumeLayout(false);
+ this.PerformLayout();
}
#endregion
@@ -424,6 +442,13 @@
m_command.Target = (OSGeo.MapGuide.MaestroAPI.TargetType)Enum.Parse(typeof(OSGeo.MapGuide.MaestroAPI.TargetType), Target.Text, true);
m_command.TargetFrame = TargetFrame.Text;
m_command.ResultColumns = new OSGeo.MapGuide.MaestroAPI.ResultColumnTypeCollection();
+ m_command.Prompt = Prompt.Text;
+ m_command.Layer = Layer.Text;
+ m_command.Filter = Filter.Text;
+ int i;
+ if (int.TryParse(ResultLimit.Text, out i))
+ m_command.MatchLimit = i;
+
foreach(DataRow dr in ResultTable.Rows)
{
OSGeo.MapGuide.MaestroAPI.ResultColumnType rs = new OSGeo.MapGuide.MaestroAPI.ResultColumnType();
@@ -453,14 +478,38 @@
m_hasChanged = true;
}
- private void BrowseLayers_Click(object sender, System.EventArgs e)
+ private void BuildFilter_Click(object sender, System.EventArgs e)
{
- MessageBox.Show(this, "This function is not yet implemented", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Information);
- }
+ try
+ {
+ if (Layer.SelectedIndex < 0)
+ {
+ MessageBox.Show(this, "Please select a layer first", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Information);
+ return;
+ }
- private void BuildFilter_Click(object sender, System.EventArgs e)
- {
- MessageBox.Show(this, "This function is not yet implemented", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Information);
+ MaestroAPI.MapLayerType l = m_layerList[Layer.SelectedIndex];
+ MaestroAPI.LayerDefinition ldef = m_editor.CurrentConnection.GetLayerDefinition(l.ResourceId);
+ MaestroAPI.VectorLayerDefinitionType vldef = ldef.Item as MaestroAPI.VectorLayerDefinitionType;
+ if (vldef == null)
+ {
+ MessageBox.Show(this, "The selected layer is not a vector layer, please select a vector layer", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Information);
+ return;
+ }
+
+ MaestroAPI.FeatureSource fs =m_editor.CurrentConnection.GetFeatureSource(vldef.ResourceId);
+ MaestroAPI.FeatureSourceDescription.FeatureSourceSchema schema = m_editor.CurrentConnection.GetFeatureSourceSchema(vldef.ResourceId, vldef.FeatureName);
+
+
+ string exp = m_editor.EditExpression(Filter.Text, schema, fs.Provider);
+ if (exp != null)
+ Filter.Text = exp;
+ }
+ catch (Exception ex)
+ {
+ m_editor.SetLastException(ex);
+ MessageBox.Show(this, string.Format("An error occured: {0}", ex.Message), Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Information);
+ }
}
private void resultColumns_Leave(object sender, System.EventArgs e)
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/LayoutControls/SearchCommand.resx
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/LayoutControls/SearchCommand.resx 2009-08-30 11:17:41 UTC (rev 4199)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/LayoutControls/SearchCommand.resx 2009-08-30 13:18:59 UTC (rev 4200)
@@ -3,7 +3,7 @@
<!--
Microsoft ResX Schema
- Version 1.3
+ 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
@@ -14,16 +14,17 @@
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">1.3</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">this is my long string</data>
+ <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">
- [base64 mime encoded serialized .NET Framework object]
+ <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">
- [base64 mime encoded string representing a byte array form of the .NET Framework object]
+ <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
@@ -35,7 +36,7 @@
Classes that don't support this are serialized and stored with the
mimetype set.
- The mimetype is used forserialized objects, and tells the
+ 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:
@@ -45,7 +46,7 @@
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
- : System.Serialization.Formatters.Binary.BinaryFormatter
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
@@ -59,18 +60,37 @@
: 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" msdata:Ordinal="1" />
+ <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">
@@ -89,231 +109,15 @@
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
- <value>1.3</value>
+ <value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <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=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <data name="TargetFrame.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="TargetFrame.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="TargetFrame.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="label2.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="label2.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="label2.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="Target.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="Target.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="Target.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="label1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="label1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="label1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="label3.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="label3.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="label3.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="Prompt.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="Prompt.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="Prompt.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="BrowseLayers.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="BrowseLayers.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="BrowseLayers.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="Layer.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="Layer.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="Layer.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="label4.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="label4.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="label4.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="label5.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="label5.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="label5.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="Filter.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="Filter.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="Filter.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="BuildFilter.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="BuildFilter.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="BuildFilter.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="ResultLimit.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="ResultLimit.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="ResultLimit.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="label6.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="label6.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="label6.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="resultColumns.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="resultColumns.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="resultColumns.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="ResultTable.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="ResultTable.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="dataColumn1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="dataColumn1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="dataColumn2.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="dataColumn2.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="dataGridTableStyle1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="dataGridTableStyle1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="CaptionColumnStyle.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="CaptionColumnStyle.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="PropertyColumnStyle.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="PropertyColumnStyle.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="label7.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="label7.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="label7.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="dataSet.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="dataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
- </data>
- <data name="dataSet.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="dataSet.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="$this.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="$this.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </data>
- <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </data>
- <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>80</value>
- </data>
- <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>(Default)</value>
- </data>
- <data name="$this.Name">
- <value>SearchCommand</value>
- </data>
- <data name="$this.Localizable" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>False</value>
- </data>
- <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>Private</value>
- </data>
- <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>8, 8</value>
- </data>
+ </metadata>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/ThemeCreator.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/ThemeCreator.cs 2009-08-30 11:17:41 UTC (rev 4199)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/ThemeCreator.cs 2009-08-30 13:18:59 UTC (rev 4200)
@@ -207,6 +207,8 @@
m_values[value]++;
}
+ rawEx = null; //Clear error
+
}
catch (Exception ex)
{
Modified: trunk/Tools/Maestro/MaestroAPI/Generated/WebLayout-1.0.0.cs
===================================================================
--- trunk/Tools/Maestro/MaestroAPI/Generated/WebLayout-1.0.0.cs 2009-08-30 11:17:41 UTC (rev 4199)
+++ trunk/Tools/Maestro/MaestroAPI/Generated/WebLayout-1.0.0.cs 2009-08-30 13:18:59 UTC (rev 4200)
@@ -516,7 +516,7 @@
private string m_filter;
- private string m_matchLimit;
+ private int m_matchLimit;
/// <remarks/>
public string Layer {
@@ -560,8 +560,7 @@
}
/// <remarks/>
- [System.Xml.Serialization.XmlElementAttribute(DataType="integer")]
- public string MatchLimit {
+ public int MatchLimit {
get {
return this.m_matchLimit;
}
More information about the mapguide-commits
mailing list