[mapguide-commits] r6018 - in trunk/Tools/Maestro/Maestro.Editors:
Common Migration
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Aug 1 07:07:21 EDT 2011
Author: jng
Date: 2011-08-01 04:07:21 -0700 (Mon, 01 Aug 2011)
New Revision: 6018
Modified:
trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.cs
trunk/Tools/Maestro/Maestro.Editors/Migration/CopyMoveToServerDialog.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/Migration/CopyMoveToServerDialog.cs
trunk/Tools/Maestro/Maestro.Editors/Migration/CopyMoveToServerDialog.resx
Log:
#1732: Remember last selected folder and values in Copy/Move Resources dialog
Modified: trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.cs 2011-08-01 10:29:48 UTC (rev 6017)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.cs 2011-08-01 11:07:21 UTC (rev 6018)
@@ -112,9 +112,14 @@
if (!ResourceIdentifier.IsFolderResource(folderId))
throw new ArgumentException(string.Format(Properties.Resources.NotAFolder, folderId));
+ this.ActiveControl = trvFolders;
_model.NavigateTo(folderId);
+ this.SelectedFolder = folderId;
+
}
+ public string SelectedFolder { get; private set; }
+
private ResourcePickerMode _mode = ResourcePickerMode.OpenResource;
/// <summary>
@@ -230,6 +235,7 @@
private void UpdateResourceId()
{
btnOK.Enabled = false;
+ this.SelectedFolder = txtFolder.Text;
if (this.SelectFoldersOnly)
{
txtResourceId.Text = txtFolder.Text;
Modified: trunk/Tools/Maestro/Maestro.Editors/Migration/CopyMoveToServerDialog.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Migration/CopyMoveToServerDialog.Designer.cs 2011-08-01 10:29:48 UTC (rev 6017)
+++ trunk/Tools/Maestro/Maestro.Editors/Migration/CopyMoveToServerDialog.Designer.cs 2011-08-01 11:07:21 UTC (rev 6018)
@@ -153,6 +153,7 @@
resources.ApplyResources(this.chkOverwrite, "chkOverwrite");
this.chkOverwrite.Name = "chkOverwrite";
this.chkOverwrite.UseVisualStyleBackColor = true;
+ this.chkOverwrite.CheckedChanged += new System.EventHandler(this.chkOverwrite_CheckedChanged);
//
// cmbAction
//
@@ -160,6 +161,7 @@
this.cmbAction.FormattingEnabled = true;
resources.ApplyResources(this.cmbAction, "cmbAction");
this.cmbAction.Name = "cmbAction";
+ this.cmbAction.SelectedIndexChanged += new System.EventHandler(this.cmbAction_SelectedIndexChanged);
//
// label2
//
Modified: trunk/Tools/Maestro/Maestro.Editors/Migration/CopyMoveToServerDialog.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Migration/CopyMoveToServerDialog.cs 2011-08-01 10:29:48 UTC (rev 6017)
+++ trunk/Tools/Maestro/Maestro.Editors/Migration/CopyMoveToServerDialog.cs 2011-08-01 11:07:21 UTC (rev 6018)
@@ -53,6 +53,9 @@
{
_source = source;
_target = target;
+
+ cmbAction.SelectedItem = _lastAction;
+ chkOverwrite.Checked = _overwrite;
}
private void lstResources_SelectedIndexChanged(object sender, EventArgs e)
@@ -60,15 +63,26 @@
EvaluateCommandState();
}
+ //Used to persist state between dialog invocations
+ static string _lastSourceFolder;
+ static string _lastTargetFolder;
+ static MigrationAction _lastAction;
+ static bool _overwrite = false;
+
private void btnAddResource_Click(object sender, EventArgs e)
{
using (var picker = new ResourcePicker(_source.ResourceService, ResourcePickerMode.OpenResource))
{
+ if (!string.IsNullOrEmpty(_lastSourceFolder))
+ picker.SetStartingPoint(_lastSourceFolder);
+
if (picker.ShowDialog() == DialogResult.OK)
{
if (!lstResources.Items.Contains(picker.ResourceID))
lstResources.Items.Add(picker.ResourceID);
+ _lastSourceFolder = picker.SelectedFolder;
+
EvaluateCommandState();
}
}
@@ -78,16 +92,22 @@
{
using (var picker = new ResourcePicker(_source.ResourceService, ResourcePickerMode.OpenFolder))
{
+ if (!string.IsNullOrEmpty(_lastSourceFolder))
+ picker.SetStartingPoint(_lastSourceFolder);
+
if (picker.ShowDialog() == DialogResult.OK)
{
var folderId = picker.ResourceID;
- var list = _target.ResourceService.GetRepositoryResources(folderId);
+ var list = _source.ResourceService.GetRepositoryResources(folderId);
foreach (var item in list.Children)
{
if (!item.IsFolder && !lstResources.Items.Contains(item.ResourceId))
lstResources.Items.Add(item.ResourceId);
}
+
+ _lastSourceFolder = picker.SelectedFolder;
+
EvaluateCommandState();
}
}
@@ -176,8 +196,12 @@
{
using (var picker = new ResourcePicker(_target.ResourceService, ResourcePickerMode.OpenFolder))
{
+ if (!string.IsNullOrEmpty(_lastTargetFolder))
+ picker.SetStartingPoint(_lastTargetFolder);
+
if (picker.ShowDialog() == DialogResult.OK)
{
+ _lastTargetFolder = picker.SelectedFolder;
txtTargetFolder.Text = picker.ResourceID;
EvaluateCommandState();
}
@@ -189,6 +213,16 @@
btnRemove.Enabled = (lstResources.SelectedItem != null) || (lstResources.SelectedItems != null && lstResources.SelectedItems.Count > 0);
btnOK.Enabled = (lstResources.Items.Count > 0) && !string.IsNullOrEmpty(txtTargetFolder.Text);
}
+
+ private void cmbAction_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ _lastAction = (MigrationAction)cmbAction.SelectedItem;
+ }
+
+ private void chkOverwrite_CheckedChanged(object sender, EventArgs e)
+ {
+ _overwrite = chkOverwrite.Checked;
+ }
}
/// <summary>
Modified: trunk/Tools/Maestro/Maestro.Editors/Migration/CopyMoveToServerDialog.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Migration/CopyMoveToServerDialog.resx 2011-08-01 10:29:48 UTC (rev 6017)
+++ trunk/Tools/Maestro/Maestro.Editors/Migration/CopyMoveToServerDialog.resx 2011-08-01 11:07:21 UTC (rev 6018)
@@ -117,18 +117,69 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>3, 16</value>
+ </metadata>
+ <data name=">>lstResources.Name" xml:space="preserve">
+ <value>lstResources</value>
+ </data>
+ <data name=">>lstResources.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ListBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>lstResources.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>lstResources.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name=">>toolStrip1.Name" xml:space="preserve">
+ <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>
+ </data>
+ <data name=">>toolStrip1.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>toolStrip1.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
+ <value>13, 13</value>
+ </data>
+ <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>521, 154</value>
+ </data>
+ <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name="groupBox1.Text" xml:space="preserve">
+ <value>Source</value>
+ </data>
+ <data name=">>groupBox1.Name" xml:space="preserve">
+ <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>
+ </data>
+ <data name=">>groupBox1.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>groupBox1.ZOrder" xml:space="preserve">
+ <value>4</value>
+ </data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="lstResources.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="lstResources.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 41</value>
</data>
<data name="lstResources.Size" type="System.Drawing.Size, System.Drawing">
<value>515, 108</value>
</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>
</data>
@@ -145,8 +196,32 @@
<value>0</value>
</data>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
+ <value>3, 16</value>
</metadata>
+ <data name="toolStrip1.Location" type="System.Drawing.Point, System.Drawing">
+ <value>3, 16</value>
+ </data>
+ <data name="toolStrip1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>515, 25</value>
+ </data>
+ <data name="toolStrip1.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name="toolStrip1.Text" xml:space="preserve">
+ <value>toolStrip1</value>
+ </data>
+ <data name=">>toolStrip1.Name" xml:space="preserve">
+ <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>
+ </data>
+ <data name=">>toolStrip1.Parent" xml:space="preserve">
+ <value>groupBox1</value>
+ </data>
+ <data name=">>toolStrip1.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
<data name="btnAddResource.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
@@ -177,53 +252,65 @@
<data name="btnRemove.Text" xml:space="preserve">
<value>Remove</value>
</data>
- <data name="toolStrip1.Location" type="System.Drawing.Point, System.Drawing">
- <value>3, 16</value>
+ <data name=">>btnBrowseTarget.Name" xml:space="preserve">
+ <value>btnBrowseTarget</value>
</data>
- <data name="toolStrip1.Size" type="System.Drawing.Size, System.Drawing">
- <value>515, 25</value>
+ <data name=">>btnBrowseTarget.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name="toolStrip1.TabIndex" type="System.Int32, mscorlib">
+ <data name=">>btnBrowseTarget.Parent" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>btnBrowseTarget.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <data name="toolStrip1.Text" xml:space="preserve">
- <value>toolStrip1</value>
+ <data name=">>txtTargetFolder.Name" xml:space="preserve">
+ <value>txtTargetFolder</value>
</data>
- <data name=">>toolStrip1.Name" xml:space="preserve">
- <value>toolStrip1</value>
+ <data name=">>txtTargetFolder.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>toolStrip1.Type" xml:space="preserve">
- <value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name=">>txtTargetFolder.Parent" xml:space="preserve">
+ <value>groupBox2</value>
</data>
- <data name=">>toolStrip1.Parent" xml:space="preserve">
- <value>groupBox1</value>
- </data>
- <data name=">>toolStrip1.ZOrder" xml:space="preserve">
+ <data name=">>txtTargetFolder.ZOrder" xml:space="preserve">
<value>1</value>
</data>
- <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
- <value>13, 13</value>
+ <data name=">>label1.Name" xml:space="preserve">
+ <value>label1</value>
</data>
- <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
- <value>521, 154</value>
+ <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>
</data>
- <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
- <value>0</value>
+ <data name=">>label1.Parent" xml:space="preserve">
+ <value>groupBox2</value>
</data>
- <data name="groupBox1.Text" xml:space="preserve">
- <value>Source</value>
+ <data name=">>label1.ZOrder" xml:space="preserve">
+ <value>2</value>
</data>
- <data name=">>groupBox1.Name" xml:space="preserve">
- <value>groupBox1</value>
+ <data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing">
+ <value>13, 173</value>
</data>
- <data name=">>groupBox1.Type" xml:space="preserve">
+ <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
+ <value>521, 61</value>
+ </data>
+ <data name="groupBox2.TabIndex" type="System.Int32, mscorlib">
+ <value>1</value>
+ </data>
+ <data name="groupBox2.Text" xml:space="preserve">
+ <value>Target</value>
+ </data>
+ <data name=">>groupBox2.Name" xml:space="preserve">
+ <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>
</data>
- <data name=">>groupBox1.Parent" xml:space="preserve">
+ <data name=">>groupBox2.Parent" xml:space="preserve">
<value>$this</value>
</data>
- <data name=">>groupBox1.ZOrder" xml:space="preserve">
- <value>4</value>
+ <data name=">>groupBox2.ZOrder" xml:space="preserve">
+ <value>3</value>
</data>
<data name="btnBrowseTarget.Location" type="System.Drawing.Point, System.Drawing">
<value>478, 24</value>
@@ -297,30 +384,6 @@
<data name=">>label1.ZOrder" xml:space="preserve">
<value>2</value>
</data>
- <data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing">
- <value>13, 173</value>
- </data>
- <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
- <value>521, 61</value>
- </data>
- <data name="groupBox2.TabIndex" type="System.Int32, mscorlib">
- <value>1</value>
- </data>
- <data name="groupBox2.Text" xml:space="preserve">
- <value>Target</value>
- </data>
- <data name=">>groupBox2.Name" xml:space="preserve">
- <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>
- </data>
- <data name=">>groupBox2.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>groupBox2.ZOrder" xml:space="preserve">
- <value>3</value>
- </data>
<data name="btnOK.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
More information about the mapguide-commits
mailing list