[mapguide-commits] r6490 - in trunk/Tools/Maestro/Maestro.Editors:
. Common FeatureSource/Providers/Gdal
FeatureSource/Providers/Rdbms FeatureSource/Providers/SQLite
FeatureSource/Providers/Sdf FeatureSource/Providers/Shp
FeatureSource/Providers/Wms Fusion Fusion/WidgetEditors
LayerDefinition/Drawing LayerDefinition/Raster
LayerDefinition/Vector LayerDefinition/Vector/Scales
LayerDefinition/Vector/Scales/SymbolInstanceEditors
MapDefinition Migration PrintLayout SymbolDefinition
SymbolDefinition/GraphicsEditors WatermarkDefinition WebLayout
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Feb 8 06:17:24 EST 2012
Author: jng
Date: 2012-02-08 03:17:24 -0800 (Wed, 08 Feb 2012)
New Revision: 6490
Modified:
trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.cs
trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.resx
trunk/Tools/Maestro/Maestro.Editors/Common/SymbolPicker.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/GdalProviderCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/SQLite/SQLiteFileCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Sdf/SdfFileCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Shp/ShpFileCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsProviderCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/MapSettingsCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/MapMenuWidgetCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LastSelectedFolder.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.resx
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.resx
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceEditors/ReferenceCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.resx
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/Migration/MigrateDialog.cs
trunk/Tools/Maestro/Maestro.Editors/PrintLayout/LogoDialog.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/CompoundSymbolDefinitionEditorCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.cs
trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolReferenceCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkCollectionEditorCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditor.cs
trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.cs
Log:
This submission fixes the following issues:
- #1936: Added new jump buttons (indicated by an arrow) allowing the user to jump from Layer Definition to its related Feature Source
- #1940: Ensure connection status is cleared for all Feature Source provider editors before doing the connection test
- #1938: Ensure the name field of the Resource Picker is the first field to have focus.
- #1939: Clean up the "remember last folder" logic in the Resource Picker. Put this logic within the control itself. To gracefully handle invalid last folders (as is the case in a session with multiple connections), we reset to the root directory
Modified: trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.Designer.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.Designer.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -50,6 +50,7 @@
this.label5 = new System.Windows.Forms.Label();
this.txtName = new System.Windows.Forms.TextBox();
this.resIdComponentPanel = new System.Windows.Forms.Panel();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
@@ -79,8 +80,8 @@
this.lstResources.SmallImageList = this.resImageList;
this.lstResources.UseCompatibleStateImageBehavior = false;
this.lstResources.View = System.Windows.Forms.View.List;
+ this.lstResources.SelectedIndexChanged += new System.EventHandler(this.lstResources_SelectedIndexChanged);
this.lstResources.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.lstResources_MouseDoubleClick);
- this.lstResources.SelectedIndexChanged += new System.EventHandler(this.lstResources_SelectedIndexChanged);
//
// resImageList
//
@@ -216,6 +217,7 @@
this.splitContainer1.Panel1.PerformLayout();
this.splitContainer1.Panel2.ResumeLayout(false);
this.splitContainer1.Panel2.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
this.resIdComponentPanel.ResumeLayout(false);
this.resIdComponentPanel.PerformLayout();
Modified: trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -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: trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.resx 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.resx 2012-02-08 11:17:24 UTC (rev 6490)
@@ -112,19 +112,19 @@
<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="lstResources.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
</data>
- <metadata name="resImageList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="resImageList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
- <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="resImageList.ImageSize" type="System.Drawing.Size, System.Drawing">
<value>16, 16</value>
</data>
@@ -134,15 +134,15 @@
<data name="lstResources.Size" type="System.Drawing.Size, System.Drawing">
<value>474, 298</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="lstResources.TabIndex" type="System.Int32, mscorlib">
- <value>1</value>
+ <value>0</value>
</data>
<data name=">>lstResources.Name" xml:space="preserve">
<value>lstResources</value>
</data>
<data name=">>lstResources.Type" xml:space="preserve">
- <value>System.Windows.Forms.ListView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>lstResources.Parent" xml:space="preserve">
<value>splitContainer1.Panel2</value>
@@ -172,7 +172,7 @@
<value>btnOK</value>
</data>
<data name=">>btnOK.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=">>btnOK.Parent" xml:space="preserve">
<value>$this</value>
@@ -199,7 +199,7 @@
<value>btnCancel</value>
</data>
<data name=">>btnCancel.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=">>btnCancel.Parent" xml:space="preserve">
<value>$this</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>
@@ -229,7 +229,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>$this</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>
@@ -259,7 +259,7 @@
<value>lblFilter</value>
</data>
<data name=">>lblFilter.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=">>lblFilter.Parent" xml:space="preserve">
<value>$this</value>
@@ -277,13 +277,13 @@
<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>
</data>
<data name=">>txtResourceId.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=">>txtResourceId.Parent" xml:space="preserve">
<value>$this</value>
@@ -301,13 +301,13 @@
<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>
</data>
<data name=">>cmbResourceFilter.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=">>cmbResourceFilter.Parent" xml:space="preserve">
<value>$this</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>
@@ -334,7 +334,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>splitContainer1.Panel1</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>
@@ -361,7 +361,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>splitContainer1.Panel2</value>
@@ -381,7 +381,7 @@
<data name="trvFolders.ImageIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
- <metadata name="folderImageList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="folderImageList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>137, 17</value>
</metadata>
<data name="folderImageList.ImageSize" type="System.Drawing.Size, System.Drawing">
@@ -397,13 +397,13 @@
<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>
</data>
<data name=">>trvFolders.Type" xml:space="preserve">
- <value>System.Windows.Forms.TreeView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>trvFolders.Parent" xml:space="preserve">
<value>splitContainer1.Panel1</value>
@@ -415,7 +415,7 @@
<value>splitContainer1.Panel1</value>
</data>
<data name=">>splitContainer1.Panel1.Type" xml:space="preserve">
- <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>splitContainer1.Panel1.Parent" xml:space="preserve">
<value>splitContainer1</value>
@@ -427,7 +427,7 @@
<value>splitContainer1.Panel2</value>
</data>
<data name=">>splitContainer1.Panel2.Type" xml:space="preserve">
- <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>splitContainer1.Panel2.Parent" xml:space="preserve">
<value>splitContainer1</value>
@@ -442,13 +442,13 @@
<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>
</data>
<data name=">>splitContainer1.Type" xml:space="preserve">
- <value>System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>splitContainer1.Parent" xml:space="preserve">
<value>$this</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>
@@ -478,7 +478,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>resIdComponentPanel</value>
@@ -496,13 +496,13 @@
<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>
</data>
<data name=">>txtFolder.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=">>txtFolder.Parent" xml:space="preserve">
<value>resIdComponentPanel</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>
@@ -532,7 +532,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>resIdComponentPanel</value>
@@ -550,13 +550,13 @@
<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>
</data>
<data name=">>txtName.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=">>txtName.Parent" xml:space="preserve">
<value>resIdComponentPanel</value>
@@ -574,13 +574,13 @@
<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>
</data>
<data name=">>resIdComponentPanel.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=">>resIdComponentPanel.Parent" xml:space="preserve">
<value>$this</value>
@@ -588,7 +588,7 @@
<data name=">>resIdComponentPanel.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.ClientSize" type="System.Drawing.Size, System.Drawing">
@@ -1119,18 +1119,18 @@
<value>resImageList</value>
</data>
<data name=">>resImageList.Type" xml:space="preserve">
- <value>System.Windows.Forms.ImageList, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ImageList, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>folderImageList.Name" xml:space="preserve">
<value>folderImageList</value>
</data>
<data name=">>folderImageList.Type" xml:space="preserve">
- <value>System.Windows.Forms.ImageList, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.ImageList, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>$this.Name" xml:space="preserve">
<value>ResourcePicker</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Editors/Common/SymbolPicker.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/SymbolPicker.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/SymbolPicker.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -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: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/GdalProviderCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/GdalProviderCtrl.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Gdal/GdalProviderCtrl.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -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: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Rdbms/RdbmsBaseCtrl.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -157,6 +157,7 @@
private void btnTest_Click(object sender, EventArgs e)
{
+ txtStatus.Text = string.Empty;
using (new WaitCursor(this))
{
_service.SyncSessionCopy();
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/SQLite/SQLiteFileCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/SQLite/SQLiteFileCtrl.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/SQLite/SQLiteFileCtrl.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -100,6 +100,7 @@
private void btnTest_Click(object sender, EventArgs e)
{
+ txtStatus.Text = string.Empty;
using (new WaitCursor(this))
{
_service.SyncSessionCopy();
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Sdf/SdfFileCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Sdf/SdfFileCtrl.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Sdf/SdfFileCtrl.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -105,6 +105,7 @@
private void btnTest_Click(object sender, EventArgs e)
{
+ txtStatus.Text = string.Empty;
using (new WaitCursor(this))
{
_service.SyncSessionCopy();
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Shp/ShpFileCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Shp/ShpFileCtrl.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Shp/ShpFileCtrl.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -133,6 +133,7 @@
private void btnTest_Click(object sender, EventArgs e)
{
+ txtStatus.Text = string.Empty;
using (new WaitCursor(this))
{
_service.SyncSessionCopy();
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsProviderCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsProviderCtrl.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Wms/WmsProviderCtrl.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -84,6 +84,7 @@
private void btnTest_Click(object sender, EventArgs e)
{
+ txtStatus.Text = string.Empty;
using (new WaitCursor(this))
{
_service.SyncSessionCopy();
Modified: trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/MapCtrl.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -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: trunk/Tools/Maestro/Maestro.Editors/Fusion/MapSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/MapSettingsCtrl.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/MapSettingsCtrl.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -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: trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/MapMenuWidgetCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/MapMenuWidgetCtrl.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/Fusion/WidgetEditors/MapMenuWidgetCtrl.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -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: trunk/Tools/Maestro/Maestro.Editors/LastSelectedFolder.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LastSelectedFolder.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/LastSelectedFolder.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -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: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.Designer.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.Designer.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -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: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -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: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.resx 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.resx 2012-02-08 11:17:24 UTC (rev 6490)
@@ -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: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.Designer.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.Designer.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -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: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -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: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.resx 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Raster/RasterLayerSettingsSectionCtrl.resx 2012-02-08 11:17:24 UTC (rev 6490)
@@ -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: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceEditors/ReferenceCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceEditors/ReferenceCtrl.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstanceEditors/ReferenceCtrl.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -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: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/Scales/SymbolInstancesDialog.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -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: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.Designer.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.Designer.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -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);
@@ -197,6 +199,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: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -175,9 +175,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;
@@ -323,5 +320,10 @@
_vl.Url = txtHyperlink.Text;
}
+
+ private void btnGoToFeatureSource_Click(object sender, EventArgs e)
+ {
+ _edsvc.OpenResource(txtFeatureSource.Text);
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.resx 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Vector/VectorLayerSettingsSectionCtrl.resx 2012-02-08 11:17:24 UTC (rev 6490)
@@ -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.HeaderText" xml:space="preserve">
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/LayerPropertiesCtrl.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -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: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -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;
Modified: trunk/Tools/Maestro/Maestro.Editors/Migration/MigrateDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Migration/MigrateDialog.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/Migration/MigrateDialog.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -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: trunk/Tools/Maestro/Maestro.Editors/PrintLayout/LogoDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/PrintLayout/LogoDialog.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/PrintLayout/LogoDialog.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -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: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/CompoundSymbolDefinitionEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/CompoundSymbolDefinitionEditorCtrl.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/CompoundSymbolDefinitionEditorCtrl.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -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: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/GraphicsEditors/ImageDialog.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -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: trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolReferenceCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolReferenceCtrl.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/SymbolDefinition/SimpleSymbolReferenceCtrl.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -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: trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkCollectionEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkCollectionEditorCtrl.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkCollectionEditorCtrl.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -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: trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditor.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/WatermarkDefinition/WatermarkInstanceEditor.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -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: trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.cs 2012-02-08 05:30:02 UTC (rev 6489)
+++ trunk/Tools/Maestro/Maestro.Editors/WebLayout/WebLayoutSettingsCtrl.cs 2012-02-08 11:17:24 UTC (rev 6490)
@@ -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;
More information about the mapguide-commits
mailing list