[mapguide-commits] r6496 - in branches/maestro-4.0.x: .
Maestro.Editors Maestro.Editors/Common
Maestro.Editors/FeatureSource/Providers
Maestro.Editors/FeatureSource/Providers/Gdal
Maestro.Editors/FeatureSource/Providers/Rdbms
Maestro.Editors/FeatureSource/Providers/SQLite
Maestro.Editors/FeatureSource/Providers/Sdf
Maestro.Editors/FeatureSource/Providers/Shp
Maestro.Editors/FeatureSource/Providers/Wms
Maestro.Editors/Fusion Maestro.Editors/Fusion/WidgetEditors
Maestro.Editors/LayerDefinition/Drawing
Maestro.Editors/LayerDefinition/Raster
Maestro.Editors/LayerDefinition/Vector
Maestro.Editors/LayerDefinition/Vector/Scales
Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceEditors
Maestro.Editors/MapDefinition Maestro.Editors/Migration
Maestro.Editors/PrintLayout Maestro.Editors/SymbolDefinition
Maestro.Editors/SymbolDefinition/GraphicsEditors
Maestro.Editors/WatermarkDefinition Maestro.Editors/WebLayout
OSGeo.MapGuide.MaestroAPI/ObjectModels
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Feb 10 04:15:37 EST 2012
Author: jng
Date: 2012-02-10 01:15:37 -0800 (Fri, 10 Feb 2012)
New Revision: 6496
Modified:
branches/maestro-4.0.x/
branches/maestro-4.0.x/Maestro.Editors/Common/ResourcePicker.cs
branches/maestro-4.0.x/Maestro.Editors/Common/ResourcePicker.resx
branches/maestro-4.0.x/Maestro.Editors/Common/SymbolPicker.cs
branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Gdal/GdalProviderCtrl.cs
branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/GenericCtrl.cs
branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.cs
branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/SQLite/SQLiteFileCtrl.cs
branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Sdf/SdfFileCtrl.cs
branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Shp/ShpFileCtrl.cs
branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Wms/WmsProviderCtrl.cs
branches/maestro-4.0.x/Maestro.Editors/Fusion/MapCtrl.cs
branches/maestro-4.0.x/Maestro.Editors/Fusion/MapSettingsCtrl.cs
branches/maestro-4.0.x/Maestro.Editors/Fusion/WidgetEditors/MapMenuWidgetCtrl.cs
branches/maestro-4.0.x/Maestro.Editors/LastSelectedFolder.cs
branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.Designer.cs
branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.cs
branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.resx
branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.Designer.cs
branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.cs
branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.resx
branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceEditors/ReferenceCtrl.cs
branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs
branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.Designer.cs
branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.cs
branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.resx
branches/maestro-4.0.x/Maestro.Editors/MapDefinition/FiniteScaleListCtrl.cs
branches/maestro-4.0.x/Maestro.Editors/MapDefinition/FiniteScaleListCtrl.resx
branches/maestro-4.0.x/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.cs
branches/maestro-4.0.x/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs
branches/maestro-4.0.x/Maestro.Editors/Migration/MigrateDialog.cs
branches/maestro-4.0.x/Maestro.Editors/PrintLayout/LogoDialog.cs
branches/maestro-4.0.x/Maestro.Editors/SymbolDefinition/CompoundSymbolDefinitionEditorCtrl.cs
branches/maestro-4.0.x/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.cs
branches/maestro-4.0.x/Maestro.Editors/SymbolDefinition/SimpleSymbolReferenceCtrl.cs
branches/maestro-4.0.x/Maestro.Editors/WatermarkDefinition/WatermarkCollectionEditorCtrl.cs
branches/maestro-4.0.x/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditor.cs
branches/maestro-4.0.x/Maestro.Editors/WebLayout/WebLayoutCommandsCtrl.cs
branches/maestro-4.0.x/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.cs
branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI/ObjectModels/FeatureSource.cs
Log:
Merge and backport the following revisions to the maintenance branch (r6490, r6491, r6492, r6493, r6494)
Property changes on: branches/maestro-4.0.x
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/Tools/Maestro:6490-6494
Modified: branches/maestro-4.0.x/Maestro.Editors/Common/ResourcePicker.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/Common/ResourcePicker.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/Common/ResourcePicker.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -84,6 +84,7 @@
_model.FolderSelected += OnFolderSelected;
this.UseFilter = true;
this.Mode = mode;
+ SetStartingPoint(LastSelectedFolder.FolderId);
}
void OnFolderSelected(object sender, EventArgs e)
@@ -95,18 +96,25 @@
/// Sets the starting point.
/// </summary>
/// <param name="folderId">The folder id.</param>
+ /// <remarks>If the specified folder does not exist, it will fallback to Library://</remarks>
public void SetStartingPoint(string folderId)
{
if (string.IsNullOrEmpty(folderId))
return;
if (!ResourceIdentifier.IsFolderResource(folderId))
throw new ArgumentException(string.Format(Properties.Resources.NotAFolder, folderId));
- //if (!_resSvc.ResourceExists(folderId))
- // return;
+
+ // Library:// will *always* exist, so fallback to this if given folder doesn't check out
+ if (!_resSvc.ResourceExists(folderId))
+ folderId = "Library://";
+
this.ActiveControl = trvFolders;
_model.NavigateTo(folderId);
this.SelectedFolder = folderId;
-
+
+ //HACK: Navigating to the specified folder takes away the focus to the
+ //name field
+ this.ActiveControl = txtName;
}
/// <summary>
@@ -293,6 +301,10 @@
}
}
}
+ if (ResourceIdentifier.IsFolderResource(txtResourceId.Text))
+ LastSelectedFolder.FolderId = txtResourceId.Text;
+ else
+ LastSelectedFolder.FolderId = (txtResourceId.Text != "Library://") ? ResourceIdentifier.GetParentFolder(txtResourceId.Text) : "Library://";
this.DialogResult = DialogResult.OK;
}
Modified: branches/maestro-4.0.x/Maestro.Editors/Common/ResourcePicker.resx
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/Common/ResourcePicker.resx 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/Common/ResourcePicker.resx 2012-02-10 09:15:37 UTC (rev 6496)
@@ -136,7 +136,7 @@
</data>
<assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="lstResources.TabIndex" type="System.Int32, mscorlib">
- <value>1</value>
+ <value>0</value>
</data>
<data name=">>lstResources.Name" xml:space="preserve">
<value>lstResources</value>
@@ -220,7 +220,7 @@
<value>67, 13</value>
</data>
<data name="label1.TabIndex" type="System.Int32, mscorlib">
- <value>4</value>
+ <value>2</value>
</data>
<data name="label1.Text" xml:space="preserve">
<value>Resource ID</value>
@@ -250,7 +250,7 @@
<value>29, 13</value>
</data>
<data name="lblFilter.TabIndex" type="System.Int32, mscorlib">
- <value>5</value>
+ <value>4</value>
</data>
<data name="lblFilter.Text" xml:space="preserve">
<value>Filter</value>
@@ -277,7 +277,7 @@
<value>589, 20</value>
</data>
<data name="txtResourceId.TabIndex" type="System.Int32, mscorlib">
- <value>6</value>
+ <value>3</value>
</data>
<data name=">>txtResourceId.Name" xml:space="preserve">
<value>txtResourceId</value>
@@ -301,7 +301,7 @@
<value>391, 21</value>
</data>
<data name="cmbResourceFilter.TabIndex" type="System.Int32, mscorlib">
- <value>7</value>
+ <value>1</value>
</data>
<data name=">>cmbResourceFilter.Name" xml:space="preserve">
<value>cmbResourceFilter</value>
@@ -325,7 +325,7 @@
<value>41, 13</value>
</data>
<data name="label3.TabIndex" type="System.Int32, mscorlib">
- <value>8</value>
+ <value>1</value>
</data>
<data name="label3.Text" xml:space="preserve">
<value>Folders</value>
@@ -352,7 +352,7 @@
<value>98, 13</value>
</data>
<data name="label4.TabIndex" type="System.Int32, mscorlib">
- <value>9</value>
+ <value>1</value>
</data>
<data name="label4.Text" xml:space="preserve">
<value>Resources in folder</value>
@@ -397,7 +397,7 @@
<value>178, 298</value>
</data>
<data name="trvFolders.TabIndex" type="System.Int32, mscorlib">
- <value>9</value>
+ <value>0</value>
</data>
<data name=">>trvFolders.Name" xml:space="preserve">
<value>trvFolders</value>
@@ -442,7 +442,7 @@
<value>193</value>
</data>
<data name="splitContainer1.TabIndex" type="System.Int32, mscorlib">
- <value>10</value>
+ <value>0</value>
</data>
<data name=">>splitContainer1.Name" xml:space="preserve">
<value>splitContainer1</value>
@@ -469,7 +469,7 @@
<value>36, 13</value>
</data>
<data name="label2.TabIndex" type="System.Int32, mscorlib">
- <value>11</value>
+ <value>1</value>
</data>
<data name="label2.Text" xml:space="preserve">
<value>Folder</value>
@@ -496,7 +496,7 @@
<value>301, 20</value>
</data>
<data name="txtFolder.TabIndex" type="System.Int32, mscorlib">
- <value>12</value>
+ <value>3</value>
</data>
<data name=">>txtFolder.Name" xml:space="preserve">
<value>txtFolder</value>
@@ -523,7 +523,7 @@
<value>35, 13</value>
</data>
<data name="label5.TabIndex" type="System.Int32, mscorlib">
- <value>13</value>
+ <value>2</value>
</data>
<data name="label5.Text" xml:space="preserve">
<value>Name</value>
@@ -550,7 +550,7 @@
<value>244, 20</value>
</data>
<data name="txtName.TabIndex" type="System.Int32, mscorlib">
- <value>14</value>
+ <value>0</value>
</data>
<data name=">>txtName.Name" xml:space="preserve">
<value>txtName</value>
@@ -574,7 +574,7 @@
<value>686, 25</value>
</data>
<data name="resIdComponentPanel.TabIndex" type="System.Int32, mscorlib">
- <value>10</value>
+ <value>0</value>
</data>
<data name=">>resIdComponentPanel.Name" xml:space="preserve">
<value>resIdComponentPanel</value>
Modified: branches/maestro-4.0.x/Maestro.Editors/Common/SymbolPicker.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/Common/SymbolPicker.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/Common/SymbolPicker.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -255,9 +255,6 @@
{
using (var picker = new ResourcePicker(_conn.ResourceService, ResourceTypes.SymbolLibrary, ResourcePickerMode.OpenResource))
{
- if (LastSelectedFolder.IsSet)
- picker.SetStartingPoint(LastSelectedFolder.FolderId);
-
if (picker.ShowDialog() == DialogResult.OK)
{
LastSelectedFolder.FolderId = picker.SelectedFolder;
Modified: branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Gdal/GdalProviderCtrl.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Gdal/GdalProviderCtrl.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Gdal/GdalProviderCtrl.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -95,6 +95,7 @@
private void btnTest_Click(object sender, EventArgs e)
{
+ txtStatus.Text = string.Empty;
//Flush back to session before testing
_service.SyncSessionCopy();
string result = _fs.TestConnection();
Modified: branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/GenericCtrl.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/GenericCtrl.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/GenericCtrl.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -101,22 +101,26 @@
nameCell.Value = p.Name;
nameCell.ToolTipText = p.LocalizedName;
+ var currentValue = _fs.GetConnectionProperty(p.Name);
DataGridViewCell valueCell = null;
if (p.Enumerable)
{
valueCell = new DataGridViewTextBoxCell();
valueCell.Tag = p;
- valueCell.Value = _fs.GetConnectionProperty(p.Name);
+ valueCell.Value = currentValue;
}
else
{
valueCell = new DataGridViewTextBoxCell();
valueCell.Tag = p;
- valueCell.Value = _fs.GetConnectionProperty(p.Name);
+ valueCell.Value = currentValue;
}
- if (!string.IsNullOrEmpty(p.DefaultValue))
+ if (string.IsNullOrEmpty(currentValue) && !string.IsNullOrEmpty(p.DefaultValue))
+ {
valueCell.Value = p.DefaultValue;
+ _fs.SetConnectionProperty(p.Name, p.DefaultValue);
+ }
row.Cells.Add(nameCell);
row.Cells.Add(valueCell);
@@ -182,15 +186,20 @@
private void btnTest_Click(object sender, EventArgs e)
{
txtTestResult.Text = string.Empty;
+ var param = GetConnectionParameters();
- var param = GetConnectionParameters();
+ var cloneFs = (IFeatureSource)_fs.Clone();
+ _service.ResourceService.SaveResourceAs(cloneFs, "Session:" + _service.SessionID + "//" + Guid.NewGuid().ToString() + ".FeatureSource");
+
+ cloneFs.ClearConnectionProperties();
foreach (var key in param.AllKeys)
{
- _fs.SetConnectionProperty(key, param[key]);
+ cloneFs.SetConnectionProperty(key, param[key]);
}
- _service.ResourceService.SaveResource(_fs);
- string msg = _service.FeatureService.TestConnection(_fs.ResourceID);
+ _service.ResourceService.SaveResource(cloneFs);
+ string msg = _service.FeatureService.TestConnection(cloneFs.ResourceID);
+
if (string.IsNullOrEmpty(msg))
msg = Properties.Resources.TestConnectionNoErrors;
Modified: branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -157,6 +157,7 @@
private void btnTest_Click(object sender, EventArgs e)
{
+ txtStatus.Text = string.Empty;
using (new WaitCursor(this))
{
_service.SyncSessionCopy();
Modified: branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/SQLite/SQLiteFileCtrl.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/SQLite/SQLiteFileCtrl.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/SQLite/SQLiteFileCtrl.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -100,6 +100,7 @@
private void btnTest_Click(object sender, EventArgs e)
{
+ txtStatus.Text = string.Empty;
using (new WaitCursor(this))
{
_service.SyncSessionCopy();
Modified: branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Sdf/SdfFileCtrl.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Sdf/SdfFileCtrl.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Sdf/SdfFileCtrl.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -105,6 +105,7 @@
private void btnTest_Click(object sender, EventArgs e)
{
+ txtStatus.Text = string.Empty;
using (new WaitCursor(this))
{
_service.SyncSessionCopy();
Modified: branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Shp/ShpFileCtrl.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Shp/ShpFileCtrl.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Shp/ShpFileCtrl.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -133,6 +133,7 @@
private void btnTest_Click(object sender, EventArgs e)
{
+ txtStatus.Text = string.Empty;
using (new WaitCursor(this))
{
_service.SyncSessionCopy();
Modified: branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Wms/WmsProviderCtrl.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Wms/WmsProviderCtrl.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/FeatureSource/Providers/Wms/WmsProviderCtrl.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -84,6 +84,7 @@
private void btnTest_Click(object sender, EventArgs e)
{
+ txtStatus.Text = string.Empty;
using (new WaitCursor(this))
{
_service.SyncSessionCopy();
Modified: branches/maestro-4.0.x/Maestro.Editors/Fusion/MapCtrl.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/Fusion/MapCtrl.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/Fusion/MapCtrl.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -371,9 +371,6 @@
{
using (var picker = new ResourcePicker(_edsvc.ResourceService, ResourceTypes.MapDefinition, ResourcePickerMode.OpenResource))
{
- if (LastSelectedFolder.IsSet)
- picker.SetStartingPoint(LastSelectedFolder.FolderId);
-
if (picker.ShowDialog() == DialogResult.OK)
{
LastSelectedFolder.FolderId = picker.SelectedFolder;
Modified: branches/maestro-4.0.x/Maestro.Editors/Fusion/MapSettingsCtrl.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/Fusion/MapSettingsCtrl.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/Fusion/MapSettingsCtrl.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -180,9 +180,6 @@
{
using (var picker = new ResourcePicker(_edsvc.ResourceService, ResourceTypes.MapDefinition, ResourcePickerMode.OpenResource))
{
- if (LastSelectedFolder.IsSet)
- picker.SetStartingPoint(LastSelectedFolder.FolderId);
-
if (picker.ShowDialog() == DialogResult.OK)
{
LastSelectedFolder.FolderId = picker.SelectedFolder;
Modified: branches/maestro-4.0.x/Maestro.Editors/Fusion/WidgetEditors/MapMenuWidgetCtrl.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/Fusion/WidgetEditors/MapMenuWidgetCtrl.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/Fusion/WidgetEditors/MapMenuWidgetCtrl.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -57,9 +57,6 @@
{
using (var picker = new ResourcePicker(_edsvc.ResourceService, ResourcePickerMode.OpenFolder))
{
- if (LastSelectedFolder.IsSet)
- picker.SetStartingPoint(LastSelectedFolder.FolderId);
-
if (picker.ShowDialog() == DialogResult.OK)
{
LastSelectedFolder.FolderId = picker.SelectedFolder;
Modified: branches/maestro-4.0.x/Maestro.Editors/LastSelectedFolder.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/LastSelectedFolder.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/LastSelectedFolder.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -28,14 +28,24 @@
/// </summary>
public static class LastSelectedFolder
{
+ private static string smFolderId;
+
/// <summary>
/// Gets or sets the last selected folder resource id
/// </summary>
- public static string FolderId;
-
- /// <summary>
- /// Gets whether the last selected folder has been set
- /// </summary>
- public static bool IsSet { get { return !string.IsNullOrEmpty(FolderId); } }
+ public static string FolderId
+ {
+ get
+ {
+ if (string.IsNullOrEmpty(smFolderId))
+ return "Library://";
+ else
+ return smFolderId;
+ }
+ set
+ {
+ smFolderId = value;
+ }
+ }
}
}
Modified: branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.Designer.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.Designer.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.Designer.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -42,12 +42,14 @@
this.label3 = new System.Windows.Forms.Label();
this.cmbSheet = new System.Windows.Forms.ComboBox();
this.label2 = new System.Windows.Forms.Label();
+ this.btnGoToDrawingSource = new System.Windows.Forms.Button();
this.contentPanel.SuspendLayout();
this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// contentPanel
//
+ this.contentPanel.Controls.Add(this.btnGoToDrawingSource);
this.contentPanel.Controls.Add(this.groupBox1);
this.contentPanel.Controls.Add(this.btnBrowse);
this.contentPanel.Controls.Add(this.txtDrawingSource);
@@ -137,10 +139,18 @@
resources.ApplyResources(this.label2, "label2");
this.label2.Name = "label2";
//
+ // btnGoToDrawingSource
+ //
+ resources.ApplyResources(this.btnGoToDrawingSource, "btnGoToDrawingSource");
+ this.btnGoToDrawingSource.Image = global::Maestro.Editors.Properties.Resources.arrow;
+ this.btnGoToDrawingSource.Name = "btnGoToDrawingSource";
+ this.btnGoToDrawingSource.UseVisualStyleBackColor = true;
+ this.btnGoToDrawingSource.Click += new System.EventHandler(this.btnGoToDrawingSource_Click);
+ //
// DrawingLayerSettingsCtrl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
- this.HeaderText = "Drawing Source Settings";
+ resources.ApplyResources(this, "$this");
this.Name = "DrawingLayerSettingsCtrl";
this.contentPanel.ResumeLayout(false);
this.contentPanel.PerformLayout();
@@ -165,5 +175,6 @@
private System.Windows.Forms.Label label3;
private System.Windows.Forms.CheckedListBox chkListDwfLayers;
private System.Windows.Forms.LinkLabel lnkCheckAll;
+ private System.Windows.Forms.Button btnGoToDrawingSource;
}
}
Modified: branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -175,5 +175,10 @@
Debug.Assert(chkListDwfLayers.CheckedIndices.Count == chkListDwfLayers.Items.Count);
_dlayer.LayerFilter = GetLayerFilter();
}
+
+ private void btnGoToDrawingSource_Click(object sender, EventArgs e)
+ {
+ _service.OpenResource(txtDrawingSource.Text);
+ }
}
}
Modified: branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.resx
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.resx 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.resx 2012-02-10 09:15:37 UTC (rev 6496)
@@ -112,20 +112,47 @@
<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="btnGoToDrawingSource.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Right</value>
+ </data>
+ <data name="btnGoToDrawingSource.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="btnGoToDrawingSource.Location" type="System.Drawing.Point, System.Drawing">
+ <value>408, 17</value>
+ </data>
+ <data name="btnGoToDrawingSource.Size" type="System.Drawing.Size, System.Drawing">
+ <value>28, 23</value>
+ </data>
+ <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="btnGoToDrawingSource.TabIndex" type="System.Int32, mscorlib">
+ <value>4</value>
+ </data>
+ <data name=">>btnGoToDrawingSource.Name" xml:space="preserve">
+ <value>btnGoToDrawingSource</value>
+ </data>
+ <data name=">>btnGoToDrawingSource.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>btnGoToDrawingSource.Parent" xml:space="preserve">
+ <value>contentPanel</value>
+ </data>
+ <data name=">>btnGoToDrawingSource.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
<data name="groupBox1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
</data>
- <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="lnkCheckAll.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="lnkCheckAll.Location" type="System.Drawing.Point, System.Drawing">
<value>149, 89</value>
</data>
@@ -142,7 +169,7 @@
<value>lnkCheckAll</value>
</data>
<data name=">>lnkCheckAll.Type" xml:space="preserve">
- <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>lnkCheckAll.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -166,7 +193,7 @@
<value>chkListDwfLayers</value>
</data>
<data name=">>chkListDwfLayers.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkListDwfLayers.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -193,7 +220,7 @@
<value>label5</value>
</data>
<data name=">>label5.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label5.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -217,7 +244,7 @@
<value>txtMaxScale</value>
</data>
<data name=">>txtMaxScale.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtMaxScale.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -238,7 +265,7 @@
<value>txtMinScale</value>
</data>
<data name=">>txtMinScale.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtMinScale.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -265,7 +292,7 @@
<value>label4</value>
</data>
<data name=">>label4.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label4.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -292,7 +319,7 @@
<value>label3</value>
</data>
<data name=">>label3.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label3.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -316,7 +343,7 @@
<value>cmbSheet</value>
</data>
<data name=">>cmbSheet.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>cmbSheet.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -343,7 +370,7 @@
<value>label2</value>
</data>
<data name=">>label2.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label2.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -367,19 +394,19 @@
<value>groupBox1</value>
</data>
<data name=">>groupBox1.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>groupBox1.Parent" xml:space="preserve">
<value>contentPanel</value>
</data>
<data name=">>groupBox1.ZOrder" xml:space="preserve">
- <value>0</value>
+ <value>1</value>
</data>
<data name="btnBrowse.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Right</value>
</data>
<data name="btnBrowse.Location" type="System.Drawing.Point, System.Drawing">
- <value>408, 17</value>
+ <value>374, 17</value>
</data>
<data name="btnBrowse.Size" type="System.Drawing.Size, System.Drawing">
<value>28, 23</value>
@@ -394,13 +421,13 @@
<value>btnBrowse</value>
</data>
<data name=">>btnBrowse.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btnBrowse.Parent" xml:space="preserve">
<value>contentPanel</value>
</data>
<data name=">>btnBrowse.ZOrder" xml:space="preserve">
- <value>1</value>
+ <value>2</value>
</data>
<data name="txtDrawingSource.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
@@ -409,7 +436,7 @@
<value>103, 19</value>
</data>
<data name="txtDrawingSource.Size" type="System.Drawing.Size, System.Drawing">
- <value>299, 20</value>
+ <value>265, 20</value>
</data>
<data name="txtDrawingSource.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -418,13 +445,13 @@
<value>txtDrawingSource</value>
</data>
<data name=">>txtDrawingSource.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtDrawingSource.Parent" xml:space="preserve">
<value>contentPanel</value>
</data>
<data name=">>txtDrawingSource.ZOrder" xml:space="preserve">
- <value>2</value>
+ <value>3</value>
</data>
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -445,19 +472,19 @@
<value>label1</value>
</data>
<data name=">>label1.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label1.Parent" xml:space="preserve">
<value>contentPanel</value>
</data>
<data name=">>label1.ZOrder" xml:space="preserve">
- <value>3</value>
+ <value>4</value>
</data>
<data name=">>contentPanel.Name" xml:space="preserve">
<value>contentPanel</value>
</data>
<data name=">>contentPanel.Type" xml:space="preserve">
- <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>contentPanel.Parent" xml:space="preserve">
<value>$this</value>
@@ -465,13 +492,16 @@
<data name=">>contentPanel.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
+ <data name="$this.HeaderText" xml:space="preserve">
+ <value>Drawing Source Settings</value>
+ </data>
<data name=">>$this.Name" xml:space="preserve">
<value>DrawingLayerSettingsCtrl</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>Maestro.Shared.UI.CollapsiblePanel, Maestro.Shared.UI, Version=3.0.0.5334, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Shared.UI.CollapsiblePanel, Maestro.Shared.UI, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
</root>
\ No newline at end of file
Modified: branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.Designer.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.Designer.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.Designer.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -39,12 +39,14 @@
this.btnBrowseFeatureSource = new System.Windows.Forms.Button();
this.txtFeatureSource = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
+ this.btnGoToFeatureSource = new System.Windows.Forms.Button();
this.contentPanel.SuspendLayout();
this.grpFeatureClass.SuspendLayout();
this.SuspendLayout();
//
// contentPanel
//
+ this.contentPanel.Controls.Add(this.btnGoToFeatureSource);
this.contentPanel.Controls.Add(this.grpFeatureClass);
this.contentPanel.Controls.Add(this.txtFeatureSource);
this.contentPanel.Controls.Add(this.btnBrowseFeatureSource);
@@ -117,12 +119,19 @@
resources.ApplyResources(this.label1, "label1");
this.label1.Name = "label1";
//
+ // btnGoToFeatureSource
+ //
+ resources.ApplyResources(this.btnGoToFeatureSource, "btnGoToFeatureSource");
+ this.btnGoToFeatureSource.Image = global::Maestro.Editors.Properties.Resources.arrow;
+ this.btnGoToFeatureSource.Name = "btnGoToFeatureSource";
+ this.btnGoToFeatureSource.UseVisualStyleBackColor = true;
+ this.btnGoToFeatureSource.Click += new System.EventHandler(this.btnGoToFeatureSource_Click);
+ //
// RasterLayerSettingsSectionCtrl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
- this.HeaderText = "Feature Source Settings";
+ resources.ApplyResources(this, "$this");
this.Name = "RasterLayerSettingsSectionCtrl";
- resources.ApplyResources(this, "$this");
this.contentPanel.ResumeLayout(false);
this.contentPanel.PerformLayout();
this.grpFeatureClass.ResumeLayout(false);
@@ -143,5 +152,6 @@
private System.Windows.Forms.TextBox txtFeatureSource;
private System.Windows.Forms.Button btnBrowseFeatureSource;
private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.Button btnGoToFeatureSource;
}
}
Modified: branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -103,9 +103,6 @@
{
using (var picker = new ResourcePicker(_edsvc.ResourceService, ResourceTypes.FeatureSource, ResourcePickerMode.OpenResource))
{
- if (LastSelectedFolder.IsSet)
- picker.SetStartingPoint(LastSelectedFolder.FolderId);
-
if (picker.ShowDialog() == DialogResult.OK)
{
LastSelectedFolder.FolderId = picker.SelectedFolder;
@@ -222,5 +219,10 @@
return _cachedFs;
}
+
+ private void btnGoToFeatureSource_Click(object sender, EventArgs e)
+ {
+ _edsvc.OpenResource(txtFeatureSource.Text);
+ }
}
}
Modified: branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.resx
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.resx 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.resx 2012-02-10 09:15:37 UTC (rev 6496)
@@ -112,12 +112,41 @@
<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="btnGoToFeatureSource.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Right</value>
+ </data>
+ <data name="btnGoToFeatureSource.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="btnGoToFeatureSource.Location" type="System.Drawing.Point, System.Drawing">
+ <value>414, 4</value>
+ </data>
+ <data name="btnGoToFeatureSource.Size" type="System.Drawing.Size, System.Drawing">
+ <value>24, 23</value>
+ </data>
+ <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="btnGoToFeatureSource.TabIndex" type="System.Int32, mscorlib">
+ <value>8</value>
+ </data>
+ <data name=">>btnGoToFeatureSource.Name" xml:space="preserve">
+ <value>btnGoToFeatureSource</value>
+ </data>
+ <data name=">>btnGoToFeatureSource.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>btnGoToFeatureSource.Parent" xml:space="preserve">
+ <value>contentPanel</value>
+ </data>
+ <data name=">>btnGoToFeatureSource.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
<data name="grpFeatureClass.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
@@ -127,14 +156,12 @@
<data name="btnBrowseGeometry.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnBrowseGeometry.Location" type="System.Drawing.Point, System.Drawing">
<value>377, 42</value>
</data>
<data name="btnBrowseGeometry.Size" type="System.Drawing.Size, System.Drawing">
<value>30, 23</value>
</data>
- <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="btnBrowseGeometry.TabIndex" type="System.Int32, mscorlib">
<value>12</value>
</data>
@@ -145,7 +172,7 @@
<value>btnBrowseGeometry</value>
</data>
<data name=">>btnBrowseGeometry.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btnBrowseGeometry.Parent" xml:space="preserve">
<value>grpFeatureClass</value>
@@ -175,7 +202,7 @@
<value>label3</value>
</data>
<data name=">>label3.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label3.Parent" xml:space="preserve">
<value>grpFeatureClass</value>
@@ -205,7 +232,7 @@
<value>btnBrowseSchema</value>
</data>
<data name=">>btnBrowseSchema.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btnBrowseSchema.Parent" xml:space="preserve">
<value>grpFeatureClass</value>
@@ -235,7 +262,7 @@
<value>label2</value>
</data>
<data name=">>label2.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label2.Parent" xml:space="preserve">
<value>grpFeatureClass</value>
@@ -259,7 +286,7 @@
<value>txtGeometry</value>
</data>
<data name=">>txtGeometry.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtGeometry.Parent" xml:space="preserve">
<value>grpFeatureClass</value>
@@ -283,7 +310,7 @@
<value>txtFeatureClass</value>
</data>
<data name=">>txtFeatureClass.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtFeatureClass.Parent" xml:space="preserve">
<value>grpFeatureClass</value>
@@ -307,13 +334,13 @@
<value>grpFeatureClass</value>
</data>
<data name=">>grpFeatureClass.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>grpFeatureClass.Parent" xml:space="preserve">
<value>contentPanel</value>
</data>
<data name=">>grpFeatureClass.ZOrder" xml:space="preserve">
- <value>0</value>
+ <value>1</value>
</data>
<data name="txtFeatureSource.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
@@ -322,7 +349,7 @@
<value>112, 6</value>
</data>
<data name="txtFeatureSource.Size" type="System.Drawing.Size, System.Drawing">
- <value>288, 20</value>
+ <value>261, 20</value>
</data>
<data name="txtFeatureSource.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@@ -331,13 +358,13 @@
<value>txtFeatureSource</value>
</data>
<data name=">>txtFeatureSource.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtFeatureSource.Parent" xml:space="preserve">
<value>contentPanel</value>
</data>
<data name=">>txtFeatureSource.ZOrder" xml:space="preserve">
- <value>1</value>
+ <value>2</value>
</data>
<data name="btnBrowseFeatureSource.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Right</value>
@@ -346,10 +373,10 @@
<value>NoControl</value>
</data>
<data name="btnBrowseFeatureSource.Location" type="System.Drawing.Point, System.Drawing">
- <value>406, 4</value>
+ <value>379, 4</value>
</data>
<data name="btnBrowseFeatureSource.Size" type="System.Drawing.Size, System.Drawing">
- <value>32, 23</value>
+ <value>29, 23</value>
</data>
<data name="btnBrowseFeatureSource.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
@@ -361,13 +388,13 @@
<value>btnBrowseFeatureSource</value>
</data>
<data name=">>btnBrowseFeatureSource.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btnBrowseFeatureSource.Parent" xml:space="preserve">
<value>contentPanel</value>
</data>
<data name=">>btnBrowseFeatureSource.ZOrder" xml:space="preserve">
- <value>2</value>
+ <value>3</value>
</data>
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -391,13 +418,13 @@
<value>label1</value>
</data>
<data name=">>label1.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label1.Parent" xml:space="preserve">
<value>contentPanel</value>
</data>
<data name=">>label1.ZOrder" xml:space="preserve">
- <value>3</value>
+ <value>4</value>
</data>
<data name="contentPanel.Size" type="System.Drawing.Size, System.Drawing">
<value>449, 118</value>
@@ -406,7 +433,7 @@
<value>contentPanel</value>
</data>
<data name=">>contentPanel.Type" xml:space="preserve">
- <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>contentPanel.Parent" xml:space="preserve">
<value>$this</value>
@@ -414,7 +441,7 @@
<data name=">>contentPanel.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.HeaderText" xml:space="preserve">
@@ -427,6 +454,6 @@
<value>RasterLayerSettingsSectionCtrl</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>Maestro.Editors.Common.EditorBindableCollapsiblePanel, Maestro.Editors, Version=3.1.0.5859, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.Common.EditorBindableCollapsiblePanel, Maestro.Editors, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
</root>
\ No newline at end of file
Modified: branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceEditors/ReferenceCtrl.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceEditors/ReferenceCtrl.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceEditors/ReferenceCtrl.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -52,9 +52,6 @@
ResourceTypes.SymbolDefinition,
ResourcePickerMode.OpenResource))
{
- if (LastSelectedFolder.IsSet)
- picker.SetStartingPoint(LastSelectedFolder.FolderId);
-
if (picker.ShowDialog() == DialogResult.OK)
{
LastSelectedFolder.FolderId = picker.SelectedFolder;
Modified: branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -84,9 +84,6 @@
splitContainer1.Panel2.Controls.Clear();
using (var picker = new ResourcePicker(_edSvc.ResourceService, ResourceTypes.SymbolDefinition, ResourcePickerMode.OpenResource))
{
- if (LastSelectedFolder.IsSet)
- picker.SetStartingPoint(LastSelectedFolder.FolderId);
-
if (picker.ShowDialog() == DialogResult.OK)
{
LastSelectedFolder.FolderId = picker.SelectedFolder;
Modified: branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.Designer.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.Designer.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.Designer.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -49,6 +49,7 @@
this.label6 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
+ this.btnGoToFeatureSource = new System.Windows.Forms.Button();
this.contentPanel.SuspendLayout();
this.grpFeatureClass.SuspendLayout();
this.grpLayerSettings.SuspendLayout();
@@ -56,6 +57,7 @@
//
// contentPanel
//
+ this.contentPanel.Controls.Add(this.btnGoToFeatureSource);
this.contentPanel.Controls.Add(this.grpLayerSettings);
this.contentPanel.Controls.Add(this.grpFeatureClass);
this.contentPanel.Controls.Add(this.btnBrowseFeatureSource);
@@ -196,6 +198,14 @@
resources.ApplyResources(this.label4, "label4");
this.label4.Name = "label4";
//
+ // btnGoToFeatureSource
+ //
+ resources.ApplyResources(this.btnGoToFeatureSource, "btnGoToFeatureSource");
+ this.btnGoToFeatureSource.Image = global::Maestro.Editors.Properties.Resources.arrow;
+ this.btnGoToFeatureSource.Name = "btnGoToFeatureSource";
+ this.btnGoToFeatureSource.UseVisualStyleBackColor = true;
+ this.btnGoToFeatureSource.Click += new System.EventHandler(this.btnGoToFeatureSource_Click);
+ //
// VectorLayerSettingsSectionCtrl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -234,5 +244,6 @@
private System.Windows.Forms.Button btnBrowseSchema;
private System.Windows.Forms.TextBox txtGeometry;
private System.Windows.Forms.TextBox txtFeatureClass;
+ private System.Windows.Forms.Button btnGoToFeatureSource;
}
}
Modified: branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -161,9 +161,6 @@
{
using (var picker = new ResourcePicker(_edsvc.ResourceService, ResourceTypes.FeatureSource, ResourcePickerMode.OpenResource))
{
- if (LastSelectedFolder.IsSet)
- picker.SetStartingPoint(LastSelectedFolder.FolderId);
-
if (picker.ShowDialog() == DialogResult.OK)
{
LastSelectedFolder.FolderId = picker.SelectedFolder;
@@ -301,5 +298,10 @@
}
}
}
+
+ private void btnGoToFeatureSource_Click(object sender, EventArgs e)
+ {
+ _edsvc.OpenResource(txtFeatureSource.Text);
+ }
}
}
Modified: branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.resx
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.resx 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.resx 2012-02-10 09:15:37 UTC (rev 6496)
@@ -112,26 +112,53 @@
<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="btnGoToFeatureSource.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Right</value>
+ </data>
+ <data name="btnGoToFeatureSource.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="btnGoToFeatureSource.Location" type="System.Drawing.Point, System.Drawing">
+ <value>414, 17</value>
+ </data>
+ <data name="btnGoToFeatureSource.Size" type="System.Drawing.Size, System.Drawing">
+ <value>26, 23</value>
+ </data>
+ <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="btnGoToFeatureSource.TabIndex" type="System.Int32, mscorlib">
+ <value>5</value>
+ </data>
+ <data name=">>btnGoToFeatureSource.Name" xml:space="preserve">
+ <value>btnGoToFeatureSource</value>
+ </data>
+ <data name=">>btnGoToFeatureSource.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>btnGoToFeatureSource.Parent" xml:space="preserve">
+ <value>contentPanel</value>
+ </data>
+ <data name=">>btnGoToFeatureSource.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
<data name="grpLayerSettings.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="btnEditTooltip.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Right</value>
</data>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnEditTooltip.Location" type="System.Drawing.Point, System.Drawing">
<value>377, 66</value>
</data>
<data name="btnEditTooltip.Size" type="System.Drawing.Size, System.Drawing">
<value>30, 23</value>
</data>
- <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="btnEditTooltip.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
</data>
@@ -142,7 +169,7 @@
<value>btnEditTooltip</value>
</data>
<data name=">>btnEditTooltip.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btnEditTooltip.Parent" xml:space="preserve">
<value>grpLayerSettings</value>
@@ -169,7 +196,7 @@
<value>btnEditHyperlink</value>
</data>
<data name=">>btnEditHyperlink.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btnEditHyperlink.Parent" xml:space="preserve">
<value>grpLayerSettings</value>
@@ -196,7 +223,7 @@
<value>btnEditFilter</value>
</data>
<data name=">>btnEditFilter.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btnEditFilter.Parent" xml:space="preserve">
<value>grpLayerSettings</value>
@@ -220,7 +247,7 @@
<value>txtTooltip</value>
</data>
<data name=">>txtTooltip.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtTooltip.Parent" xml:space="preserve">
<value>grpLayerSettings</value>
@@ -244,7 +271,7 @@
<value>txtHyperlink</value>
</data>
<data name=">>txtHyperlink.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtHyperlink.Parent" xml:space="preserve">
<value>grpLayerSettings</value>
@@ -268,7 +295,7 @@
<value>txtFilter</value>
</data>
<data name=">>txtFilter.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtFilter.Parent" xml:space="preserve">
<value>grpLayerSettings</value>
@@ -295,7 +322,7 @@
<value>label6</value>
</data>
<data name=">>label6.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label6.Parent" xml:space="preserve">
<value>grpLayerSettings</value>
@@ -322,7 +349,7 @@
<value>label5</value>
</data>
<data name=">>label5.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label5.Parent" xml:space="preserve">
<value>grpLayerSettings</value>
@@ -349,7 +376,7 @@
<value>label4</value>
</data>
<data name=">>label4.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label4.Parent" xml:space="preserve">
<value>grpLayerSettings</value>
@@ -373,13 +400,13 @@
<value>grpLayerSettings</value>
</data>
<data name=">>grpLayerSettings.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>grpLayerSettings.Parent" xml:space="preserve">
<value>contentPanel</value>
</data>
<data name=">>grpLayerSettings.ZOrder" xml:space="preserve">
- <value>0</value>
+ <value>1</value>
</data>
<data name="grpFeatureClass.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
@@ -403,7 +430,7 @@
<value>btnBrowseGeometry</value>
</data>
<data name=">>btnBrowseGeometry.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btnBrowseGeometry.Parent" xml:space="preserve">
<value>grpFeatureClass</value>
@@ -430,7 +457,7 @@
<value>label3</value>
</data>
<data name=">>label3.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label3.Parent" xml:space="preserve">
<value>grpFeatureClass</value>
@@ -457,7 +484,7 @@
<value>btnBrowseSchema</value>
</data>
<data name=">>btnBrowseSchema.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btnBrowseSchema.Parent" xml:space="preserve">
<value>grpFeatureClass</value>
@@ -484,7 +511,7 @@
<value>label2</value>
</data>
<data name=">>label2.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label2.Parent" xml:space="preserve">
<value>grpFeatureClass</value>
@@ -508,7 +535,7 @@
<value>txtGeometry</value>
</data>
<data name=">>txtGeometry.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtGeometry.Parent" xml:space="preserve">
<value>grpFeatureClass</value>
@@ -532,7 +559,7 @@
<value>txtFeatureClass</value>
</data>
<data name=">>txtFeatureClass.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtFeatureClass.Parent" xml:space="preserve">
<value>grpFeatureClass</value>
@@ -556,22 +583,22 @@
<value>grpFeatureClass</value>
</data>
<data name=">>grpFeatureClass.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>grpFeatureClass.Parent" xml:space="preserve">
<value>contentPanel</value>
</data>
<data name=">>grpFeatureClass.ZOrder" xml:space="preserve">
- <value>1</value>
+ <value>2</value>
</data>
<data name="btnBrowseFeatureSource.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Right</value>
</data>
<data name="btnBrowseFeatureSource.Location" type="System.Drawing.Point, System.Drawing">
- <value>408, 17</value>
+ <value>384, 17</value>
</data>
<data name="btnBrowseFeatureSource.Size" type="System.Drawing.Size, System.Drawing">
- <value>32, 23</value>
+ <value>24, 23</value>
</data>
<data name="btnBrowseFeatureSource.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@@ -583,13 +610,13 @@
<value>btnBrowseFeatureSource</value>
</data>
<data name=">>btnBrowseFeatureSource.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btnBrowseFeatureSource.Parent" xml:space="preserve">
<value>contentPanel</value>
</data>
<data name=">>btnBrowseFeatureSource.ZOrder" xml:space="preserve">
- <value>2</value>
+ <value>3</value>
</data>
<data name="txtFeatureSource.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
@@ -598,7 +625,7 @@
<value>114, 19</value>
</data>
<data name="txtFeatureSource.Size" type="System.Drawing.Size, System.Drawing">
- <value>288, 20</value>
+ <value>264, 20</value>
</data>
<data name="txtFeatureSource.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -607,13 +634,13 @@
<value>txtFeatureSource</value>
</data>
<data name=">>txtFeatureSource.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtFeatureSource.Parent" xml:space="preserve">
<value>contentPanel</value>
</data>
<data name=">>txtFeatureSource.ZOrder" xml:space="preserve">
- <value>3</value>
+ <value>4</value>
</data>
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -634,13 +661,13 @@
<value>label1</value>
</data>
<data name=">>label1.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label1.Parent" xml:space="preserve">
<value>contentPanel</value>
</data>
<data name=">>label1.ZOrder" xml:space="preserve">
- <value>4</value>
+ <value>5</value>
</data>
<data name="contentPanel.Size" type="System.Drawing.Size, System.Drawing">
<value>449, 240</value>
@@ -649,7 +676,7 @@
<value>contentPanel</value>
</data>
<data name=">>contentPanel.Type" xml:space="preserve">
- <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>contentPanel.Parent" xml:space="preserve">
<value>$this</value>
@@ -657,7 +684,7 @@
<data name=">>contentPanel.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
Modified: branches/maestro-4.0.x/Maestro.Editors/MapDefinition/FiniteScaleListCtrl.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/MapDefinition/FiniteScaleListCtrl.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/MapDefinition/FiniteScaleListCtrl.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -49,11 +49,13 @@
private BindingList<double> _scales;
private IMapDefinition _map;
+ private IEditorService _edSvc;
- public FiniteScaleListCtrl(IMapDefinition map)
+ public FiniteScaleListCtrl(IMapDefinition map, IEditorService editorSvc)
: this()
{
_map = map;
+ _edSvc = editorSvc;
//Init scale list
if (_map.BaseMap != null)
{
@@ -87,6 +89,7 @@
{
_map.InitBaseMap();
_map.BaseMap.RemoveAllScales();
+ _edSvc.MarkDirty();
}
private void RemoveScaleFromMap(double scale)
@@ -94,12 +97,14 @@
_scales.Remove(scale);
_map.InitBaseMap();
_map.BaseMap.RemoveFiniteDisplayScale(scale);
+ _edSvc.MarkDirty();
}
private void AddScaleToMap(double scale)
{
_map.InitBaseMap();
_map.BaseMap.AddFiniteDisplayScale(scale);
+ _edSvc.MarkDirty();
}
private void btnGenerateScales_Click(object sender, EventArgs e)
@@ -132,6 +137,7 @@
{
_scales.Add(s);
}
+ _edSvc.MarkDirty();
}
}
@@ -162,6 +168,7 @@
{
_scales.Add(scale);
}
+ _edSvc.MarkDirty();
}
}
}
@@ -199,6 +206,7 @@
{
_scales.Add(scale);
}
+ _edSvc.MarkDirty();
}
}
}
Modified: branches/maestro-4.0.x/Maestro.Editors/MapDefinition/FiniteScaleListCtrl.resx
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/MapDefinition/FiniteScaleListCtrl.resx 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/MapDefinition/FiniteScaleListCtrl.resx 2012-02-10 09:15:37 UTC (rev 6496)
@@ -112,26 +112,23 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="groupBox1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
- <data name="btnGenerateScales.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
- <value>Top, Right</value>
- </data>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnGenerateScales.Location" type="System.Drawing.Point, System.Drawing">
- <value>282, 88</value>
+ <value>183, 86</value>
</data>
<data name="btnGenerateScales.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
</data>
- <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="btnGenerateScales.TabIndex" type="System.Int32, mscorlib">
<value>10</value>
</data>
@@ -142,7 +139,7 @@
<value>btnGenerateScales</value>
</data>
<data name=">>btnGenerateScales.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btnGenerateScales.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -163,7 +160,7 @@
<value>numScales</value>
</data>
<data name=">>numScales.Type" xml:space="preserve">
- <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>numScales.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -190,7 +187,7 @@
<value>label5</value>
</data>
<data name=">>label5.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label5.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -214,7 +211,7 @@
<value>cmbRounding</value>
</data>
<data name=">>cmbRounding.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>cmbRounding.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -235,7 +232,7 @@
<value>cmbMethod</value>
</data>
<data name=">>cmbMethod.Type" xml:space="preserve">
- <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>cmbMethod.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -262,7 +259,7 @@
<value>label4</value>
</data>
<data name=">>label4.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label4.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -289,7 +286,7 @@
<value>label3</value>
</data>
<data name=">>label3.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label3.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -313,7 +310,7 @@
<value>numMaxScale</value>
</data>
<data name=">>numMaxScale.Type" xml:space="preserve">
- <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>numMaxScale.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -334,7 +331,7 @@
<value>numMinScale</value>
</data>
<data name=">>numMinScale.Type" xml:space="preserve">
- <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>numMinScale.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -361,7 +358,7 @@
<value>label2</value>
</data>
<data name=">>label2.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label2.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -388,7 +385,7 @@
<value>label1</value>
</data>
<data name=">>label1.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label1.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -412,7 +409,7 @@
<value>groupBox1</value>
</data>
<data name=">>groupBox1.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>groupBox1.Parent" xml:space="preserve">
<value>$this</value>
@@ -430,7 +427,7 @@
<value>3, 41</value>
</data>
<data name="lstDisplayScales.Size" type="System.Drawing.Size, System.Drawing">
- <value>372, 82</value>
+ <value>372, 93</value>
</data>
<data name="lstDisplayScales.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -439,7 +436,7 @@
<value>lstDisplayScales</value>
</data>
<data name=">>lstDisplayScales.Type" xml:space="preserve">
- <value>System.Windows.Forms.ListBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>lstDisplayScales.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -447,7 +444,7 @@
<data name=">>lstDisplayScales.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>3, 16</value>
</metadata>
<data name="btnEditScalesManually.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
@@ -499,7 +496,7 @@
<value>toolStrip1</value>
</data>
<data name=">>toolStrip1.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>toolStrip1.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -523,7 +520,7 @@
<value>groupBox2</value>
</data>
<data name=">>groupBox2.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>groupBox2.Parent" xml:space="preserve">
<value>$this</value>
@@ -531,7 +528,7 @@
<data name=">>groupBox2.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
@@ -541,30 +538,30 @@
<value>btnEditScalesManually</value>
</data>
<data name=">>btnEditScalesManually.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btnRemoveScale.Name" xml:space="preserve">
<value>btnRemoveScale</value>
</data>
<data name=">>btnRemoveScale.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>toolStripSeparator1.Name" xml:space="preserve">
<value>toolStripSeparator1</value>
</data>
<data name=">>toolStripSeparator1.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btnCmsScaleList.Name" xml:space="preserve">
<value>btnCmsScaleList</value>
</data>
<data name=">>btnCmsScaleList.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>$this.Name" xml:space="preserve">
<value>FiniteScaleListCtrl</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>
\ No newline at end of file
Modified: branches/maestro-4.0.x/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -86,9 +86,6 @@
{
using (var picker = new ResourcePicker(_resSvc, ResourceTypes.LayerDefinition, ResourcePickerMode.OpenResource))
{
- if (LastSelectedFolder.IsSet)
- picker.SetStartingPoint(LastSelectedFolder.FolderId);
-
if (picker.ShowDialog() == DialogResult.OK)
{
LastSelectedFolder.FolderId = picker.SelectedFolder;
Modified: branches/maestro-4.0.x/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -268,9 +268,6 @@
{
using (var picker = new ResourcePicker(_edSvc.ResourceService, ResourceTypes.LayerDefinition, ResourcePickerMode.OpenResource))
{
- if (LastSelectedFolder.IsSet)
- picker.SetStartingPoint(LastSelectedFolder.FolderId);
-
if (picker.ShowDialog() == DialogResult.OK)
{
LastSelectedFolder.FolderId = picker.SelectedFolder;
@@ -343,9 +340,6 @@
{
using (var picker = new ResourcePicker(_edSvc.ResourceService, ResourceTypes.LayerDefinition, ResourcePickerMode.OpenResource))
{
- if (LastSelectedFolder.IsSet)
- picker.SetStartingPoint(LastSelectedFolder.FolderId);
-
if (picker.ShowDialog() == DialogResult.OK)
{
LastSelectedFolder.FolderId = picker.SelectedFolder;
@@ -636,9 +630,6 @@
{
using (var picker = new ResourcePicker(_edSvc.ResourceService, ResourceTypes.LayerDefinition, ResourcePickerMode.OpenResource))
{
- if (LastSelectedFolder.IsSet)
- picker.SetStartingPoint(LastSelectedFolder.FolderId);
-
if (picker.ShowDialog() == DialogResult.OK)
{
LastSelectedFolder.FolderId = picker.SelectedFolder;
@@ -833,7 +824,7 @@
private void OnFiniteScaleListSelected()
{
propertiesPanel.Controls.Clear();
- var item = new FiniteScaleListCtrl(_map);
+ var item = new FiniteScaleListCtrl(_map, _edSvc);
item.Dock = DockStyle.Fill;
propertiesPanel.Controls.Add(item);
Modified: branches/maestro-4.0.x/Maestro.Editors/Migration/MigrateDialog.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/Migration/MigrateDialog.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/Migration/MigrateDialog.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -125,9 +125,6 @@
{
using (var picker = new ResourcePicker(_source.ResourceService, ResourcePickerMode.OpenResource))
{
- if (LastSelectedFolder.IsSet)
- picker.SetStartingPoint(LastSelectedFolder.FolderId);
-
if (picker.ShowDialog() == DialogResult.OK)
{
LastSelectedFolder.FolderId = picker.SelectedFolder;
Modified: branches/maestro-4.0.x/Maestro.Editors/PrintLayout/LogoDialog.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/PrintLayout/LogoDialog.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/PrintLayout/LogoDialog.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -119,9 +119,6 @@
{
using (var picker = new ResourcePicker(_conn.ResourceService, ResourceTypes.SymbolLibrary, ResourcePickerMode.OpenResource))
{
- if (LastSelectedFolder.IsSet)
- picker.SetStartingPoint(LastSelectedFolder.FolderId);
-
if (picker.ShowDialog() == DialogResult.OK)
{
LastSelectedFolder.FolderId = picker.SelectedFolder;
Modified: branches/maestro-4.0.x/Maestro.Editors/SymbolDefinition/CompoundSymbolDefinitionEditorCtrl.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/SymbolDefinition/CompoundSymbolDefinitionEditorCtrl.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/SymbolDefinition/CompoundSymbolDefinitionEditorCtrl.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -129,9 +129,6 @@
ResourceTypes.SymbolDefinition,
ResourcePickerMode.OpenResource))
{
- if (LastSelectedFolder.IsSet)
- picker.SetStartingPoint(LastSelectedFolder.FolderId);
-
if (picker.ShowDialog() == DialogResult.OK)
{
LastSelectedFolder.FolderId = picker.SelectedFolder;
Modified: branches/maestro-4.0.x/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -173,9 +173,6 @@
{
using (var picker = new ResourcePicker(_ssd.CurrentConnection.ResourceService, ResourcePickerMode.OpenResource))
{
- if (LastSelectedFolder.IsSet)
- picker.SetStartingPoint(LastSelectedFolder.FolderId);
-
if (picker.ShowDialog() == DialogResult.OK)
{
LastSelectedFolder.FolderId = picker.SelectedFolder;
Modified: branches/maestro-4.0.x/Maestro.Editors/SymbolDefinition/SimpleSymbolReferenceCtrl.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/SymbolDefinition/SimpleSymbolReferenceCtrl.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/SymbolDefinition/SimpleSymbolReferenceCtrl.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -63,9 +63,6 @@
ResourceTypes.SymbolDefinition,
ResourcePickerMode.OpenResource))
{
- if (LastSelectedFolder.IsSet)
- picker.SetStartingPoint(LastSelectedFolder.FolderId);
-
if (picker.ShowDialog() == DialogResult.OK)
{
LastSelectedFolder.FolderId = picker.ResourceID;
Modified: branches/maestro-4.0.x/Maestro.Editors/WatermarkDefinition/WatermarkCollectionEditorCtrl.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/WatermarkDefinition/WatermarkCollectionEditorCtrl.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/WatermarkDefinition/WatermarkCollectionEditorCtrl.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -60,9 +60,6 @@
{
using (var picker = new ResourcePicker(_resSvc, ResourceTypes.WatermarkDefinition, ResourcePickerMode.OpenResource))
{
- if (LastSelectedFolder.IsSet)
- picker.SetStartingPoint(LastSelectedFolder.FolderId);
-
if (picker.ShowDialog() == DialogResult.OK)
{
LastSelectedFolder.FolderId = picker.SelectedFolder;
Modified: branches/maestro-4.0.x/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditor.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditor.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditor.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -128,9 +128,6 @@
{
using (var picker = new ResourcePicker(_resSvc, ResourceTypes.WatermarkDefinition, ResourcePickerMode.OpenResource))
{
- if (LastSelectedFolder.IsSet)
- picker.SetStartingPoint(LastSelectedFolder.FolderId);
-
if (picker.ShowDialog() == DialogResult.OK)
{
LastSelectedFolder.FolderId = picker.SelectedFolder;
Modified: branches/maestro-4.0.x/Maestro.Editors/WebLayout/WebLayoutCommandsCtrl.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/WebLayout/WebLayoutCommandsCtrl.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/WebLayout/WebLayoutCommandsCtrl.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -137,20 +137,41 @@
btnExport.Enabled = customCmds.Length > 0;
}
+ private void SetSelectedCommand(ICommand cmd)
+ {
+ grdCommands.ClearSelection();
+ foreach (DataGridViewRow row in grdCommands.Rows)
+ {
+ if (row.DataBoundItem == cmd)
+ {
+ //HACK: This is a long-winded way of simulating a programmatic
+ //click of the cell that contains this databound item
+ //
+ //See: http://social.msdn.microsoft.com/forums/en-US/winformsdatacontrols/thread/47e9c3ef-a8de-48c9-8e0d-4f3fdd34517e/
+ grdCommands.FirstDisplayedScrollingRowIndex = row.Index;
+ grdCommands.Refresh();
+ grdCommands.CurrentCell = row.Cells[1];
+ row.Selected = true;
+ grdCommands_CellContentClick(this, new DataGridViewCellEventArgs(1, row.Index));
+ break;
+ }
+ }
+ }
+
private void invokeURLToolStripMenuItem_Click(object sender, EventArgs e)
{
var cmd = _wl.CreateInvokeUrlCommand();
cmd.Description = cmd.Label = cmd.Tooltip = Properties.Resources.InvokeUrlCmdDescription;
- //_wl.CommandSet.AddCommand(cmd);
_commands.Add(cmd);
+ SetSelectedCommand(cmd);
}
private void invokeScriptToolStripMenuItem_Click(object sender, EventArgs e)
{
var cmd = _wl.CreateInvokeScriptCommand();
cmd.Description = cmd.Label = cmd.Tooltip = Properties.Resources.InvokeScriptCmdDescription;
- //_wl.CommandSet.AddCommand(cmd);
_commands.Add(cmd);
+ SetSelectedCommand(cmd);
}
private void searchToolStripMenuItem_Click(object sender, EventArgs e)
@@ -163,8 +184,8 @@
var cmd = _wl.CreateSearchCommand();
cmd.Description = cmd.Label = cmd.Tooltip = Properties.Resources.SearchCmdDescription;
- //_wl.CommandSet.AddCommand(cmd);
_commands.Add(cmd);
+ SetSelectedCommand(cmd);
}
private void grdCommands_CellContentClick(object sender, DataGridViewCellEventArgs e)
@@ -236,7 +257,7 @@
using (new WaitCursor(this))
{
_wl.CommandSet.RemoveCommand(iscr);
- _commands.Remove(iurl);
+ _commands.Remove(iscr);
_wl.RemoveAllReferences(iscr.Name);
ClearCommandUI();
}
@@ -252,7 +273,7 @@
using (new WaitCursor(this))
{
_wl.CommandSet.RemoveCommand(srch);
- _commands.Remove(iurl);
+ _commands.Remove(srch);
_wl.RemoveAllReferences(srch.Name);
ClearCommandUI();
}
Modified: branches/maestro-4.0.x/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -218,9 +218,6 @@
{
using (var picker = new ResourcePicker(_edsvc.ResourceService, ResourceTypes.MapDefinition, ResourcePickerMode.OpenResource))
{
- if (LastSelectedFolder.IsSet)
- picker.SetStartingPoint(LastSelectedFolder.FolderId);
-
if (picker.ShowDialog() == DialogResult.OK)
{
LastSelectedFolder.FolderId = picker.SelectedFolder;
Modified: branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI/ObjectModels/FeatureSource.cs
===================================================================
--- branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI/ObjectModels/FeatureSource.cs 2012-02-09 03:32:52 UTC (rev 6495)
+++ branches/maestro-4.0.x/OSGeo.MapGuide.MaestroAPI/ObjectModels/FeatureSource.cs 2012-02-10 09:15:37 UTC (rev 6496)
@@ -25,6 +25,7 @@
using OSGeo.MapGuide.MaestroAPI;
using OSGeo.MapGuide.ObjectModels.Common;
using OSGeo.MapGuide.ObjectModels.FeatureSource;
+using System.ComponentModel;
#pragma warning disable 1591, 0114, 0108
@@ -86,7 +87,9 @@
object ICloneable.Clone()
{
- return this.Clone();
+ var fs = this.Clone();
+ fs.DetachChangeListeners();
+ return fs;
}
[XmlAttribute("noNamespaceSchemaLocation", Namespace = "http://www.w3.org/2001/XMLSchema-instance")]
@@ -155,6 +158,19 @@
OnPropertyChanged("Parameter");
}
+ protected void DetachChangeListeners()
+ {
+ var handler = this.PropertyChanged;
+ if (handler != null)
+ {
+ foreach (var h in handler.GetInvocationList())
+ {
+ this.PropertyChanged -= (PropertyChangedEventHandler)h;
+ }
+ handler = null;
+ }
+ }
+
[XmlIgnore]
public string ConnectionString
{
More information about the mapguide-commits
mailing list