[mapguide-commits] r5886 -
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue May 31 09:05:25 EDT 2011
Author: jng
Date: 2011-05-31 06:05:25 -0700 (Tue, 31 May 2011)
New Revision: 5886
Modified:
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/FileBasedCtrl.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/FileBasedCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/FileBasedCtrl.resx
Log:
#1706: Offer alias browsing by file and folder. Reuse the CanSelectFolders() logic to enable/disable the folder browse button
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/FileBasedCtrl.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/FileBasedCtrl.Designer.cs 2011-05-31 12:38:36 UTC (rev 5885)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/FileBasedCtrl.Designer.cs 2011-05-31 13:05:25 UTC (rev 5886)
@@ -34,10 +34,11 @@
this.rdUnmanaged = new System.Windows.Forms.RadioButton();
this.label1 = new System.Windows.Forms.Label();
this.txtAlias = new System.Windows.Forms.TextBox();
- this.btnBrowseAlias = new System.Windows.Forms.Button();
+ this.btnBrowseAliasFile = new System.Windows.Forms.Button();
this.tt = new System.Windows.Forms.ToolTip(this.components);
this.unmanagedPanel = new System.Windows.Forms.Panel();
this.resDataCtrl = new Maestro.Editors.Common.ResourceDataCtrl();
+ this.btnBrowseAliasFolder = new System.Windows.Forms.Button();
this.contentPanel.SuspendLayout();
this.unmanagedPanel.SuspendLayout();
this.SuspendLayout();
@@ -78,18 +79,20 @@
this.txtAlias.Name = "txtAlias";
this.txtAlias.TextChanged += new System.EventHandler(this.txtAlias_TextChanged);
//
- // btnBrowseAlias
+ // btnBrowseAliasFile
//
- resources.ApplyResources(this.btnBrowseAlias, "btnBrowseAlias");
- this.btnBrowseAlias.Name = "btnBrowseAlias";
- this.btnBrowseAlias.UseVisualStyleBackColor = true;
- this.btnBrowseAlias.Click += new System.EventHandler(this.btnBrowseAlias_Click);
+ resources.ApplyResources(this.btnBrowseAliasFile, "btnBrowseAliasFile");
+ this.btnBrowseAliasFile.Image = global::Maestro.Editors.Properties.Resources.document;
+ this.btnBrowseAliasFile.Name = "btnBrowseAliasFile";
+ this.btnBrowseAliasFile.UseVisualStyleBackColor = true;
+ this.btnBrowseAliasFile.Click += new System.EventHandler(this.btnBrowseAlias_Click);
//
// unmanagedPanel
//
resources.ApplyResources(this.unmanagedPanel, "unmanagedPanel");
+ this.unmanagedPanel.Controls.Add(this.btnBrowseAliasFolder);
this.unmanagedPanel.Controls.Add(this.label1);
- this.unmanagedPanel.Controls.Add(this.btnBrowseAlias);
+ this.unmanagedPanel.Controls.Add(this.btnBrowseAliasFile);
this.unmanagedPanel.Controls.Add(this.txtAlias);
this.unmanagedPanel.Name = "unmanagedPanel";
//
@@ -100,6 +103,14 @@
this.resDataCtrl.MarkEnabled = true;
this.resDataCtrl.Name = "resDataCtrl";
//
+ // btnBrowseAliasFolder
+ //
+ resources.ApplyResources(this.btnBrowseAliasFolder, "btnBrowseAliasFolder");
+ this.btnBrowseAliasFolder.Image = global::Maestro.Editors.Properties.Resources.folder_horizontal;
+ this.btnBrowseAliasFolder.Name = "btnBrowseAliasFolder";
+ this.btnBrowseAliasFolder.UseVisualStyleBackColor = true;
+ this.btnBrowseAliasFolder.Click += new System.EventHandler(this.btnBrowseAliasFolder_Click);
+ //
// FileBasedCtrl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -118,9 +129,10 @@
private System.Windows.Forms.ToolTip tt;
private System.Windows.Forms.Panel unmanagedPanel;
protected Maestro.Editors.Common.ResourceDataCtrl resDataCtrl;
- protected System.Windows.Forms.Button btnBrowseAlias;
+ protected System.Windows.Forms.Button btnBrowseAliasFile;
protected System.Windows.Forms.TextBox txtAlias;
protected System.Windows.Forms.RadioButton rdUnmanaged;
protected System.Windows.Forms.RadioButton rdManaged;
+ protected System.Windows.Forms.Button btnBrowseAliasFolder;
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/FileBasedCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/FileBasedCtrl.cs 2011-05-31 12:38:36 UTC (rev 5885)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/FileBasedCtrl.cs 2011-05-31 13:05:25 UTC (rev 5886)
@@ -56,6 +56,8 @@
{
_service = service;
_service.RegisterCustomNotifier(this);
+ btnBrowseAliasFile.Enabled = true;
+ btnBrowseAliasFolder.Enabled = CanSelectFolders();
resDataCtrl.Init(service);
resDataCtrl.DataListChanged += (sender, e) => { OnResourceChanged(); };
resDataCtrl.ResourceDataMarked += (sender, e) => { OnResourceMarked(e); };
@@ -70,7 +72,7 @@
{
using (var picker = new UnmanagedFileBrowser(_service.ResourceService))
{
- picker.SelectFoldersOnly = CanSelectFolders();
+ picker.SelectFoldersOnly = false;
if (picker.ShowDialog() == DialogResult.OK)
{
txtAlias.Text = picker.SelectedItem;
@@ -78,6 +80,18 @@
}
}
+ private void btnBrowseAliasFolder_Click(object sender, EventArgs e)
+ {
+ using (var picker = new UnmanagedFileBrowser(_service.ResourceService))
+ {
+ picker.SelectFoldersOnly = true;
+ if (picker.ShowDialog() == DialogResult.OK)
+ {
+ txtAlias.Text = picker.SelectedItem;
+ }
+ }
+ }
+
protected virtual string FileFdoProperty { get { return "File"; } }
protected virtual bool CanSelectFolders()
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/FileBasedCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/FileBasedCtrl.resx 2011-05-31 12:38:36 UTC (rev 5885)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/FileBasedCtrl.resx 2011-05-31 13:05:25 UTC (rev 5886)
@@ -121,11 +121,38 @@
<data name="unmanagedPanel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
+ <data name="btnBrowseAliasFolder.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Right</value>
+ </data>
+ <data name="btnBrowseAliasFolder.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="btnBrowseAliasFolder.Location" type="System.Drawing.Point, System.Drawing">
+ <value>375, 2</value>
+ </data>
+ <data name="btnBrowseAliasFolder.Size" type="System.Drawing.Size, System.Drawing">
+ <value>25, 25</value>
+ </data>
<assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="btnBrowseAliasFolder.TabIndex" type="System.Int32, mscorlib">
+ <value>8</value>
+ </data>
+ <data name=">>btnBrowseAliasFolder.Name" xml:space="preserve">
+ <value>btnBrowseAliasFolder</value>
+ </data>
+ <data name=">>btnBrowseAliasFolder.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=">>btnBrowseAliasFolder.Parent" xml:space="preserve">
+ <value>unmanagedPanel</value>
+ </data>
+ <data name=">>btnBrowseAliasFolder.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
<data name="label1.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="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 8</value>
</data>
@@ -148,34 +175,31 @@
<value>unmanagedPanel</value>
</data>
<data name=">>label1.ZOrder" xml:space="preserve">
- <value>0</value>
+ <value>1</value>
</data>
- <data name="btnBrowseAlias.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <data name="btnBrowseAliasFile.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Right</value>
</data>
- <data name="btnBrowseAlias.Location" type="System.Drawing.Point, System.Drawing">
- <value>373, 3</value>
+ <data name="btnBrowseAliasFile.Location" type="System.Drawing.Point, System.Drawing">
+ <value>344, 2</value>
</data>
- <data name="btnBrowseAlias.Size" type="System.Drawing.Size, System.Drawing">
- <value>32, 23</value>
+ <data name="btnBrowseAliasFile.Size" type="System.Drawing.Size, System.Drawing">
+ <value>25, 25</value>
</data>
- <data name="btnBrowseAlias.TabIndex" type="System.Int32, mscorlib">
+ <data name="btnBrowseAliasFile.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
</data>
- <data name="btnBrowseAlias.Text" xml:space="preserve">
- <value>...</value>
+ <data name=">>btnBrowseAliasFile.Name" xml:space="preserve">
+ <value>btnBrowseAliasFile</value>
</data>
- <data name=">>btnBrowseAlias.Name" xml:space="preserve">
- <value>btnBrowseAlias</value>
- </data>
- <data name=">>btnBrowseAlias.Type" xml:space="preserve">
+ <data name=">>btnBrowseAliasFile.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=">>btnBrowseAlias.Parent" xml:space="preserve">
+ <data name=">>btnBrowseAliasFile.Parent" xml:space="preserve">
<value>unmanagedPanel</value>
</data>
- <data name=">>btnBrowseAlias.ZOrder" xml:space="preserve">
- <value>1</value>
+ <data name=">>btnBrowseAliasFile.ZOrder" xml:space="preserve">
+ <value>2</value>
</data>
<data name="txtAlias.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
@@ -184,7 +208,7 @@
<value>111, 5</value>
</data>
<data name="txtAlias.Size" type="System.Drawing.Size, System.Drawing">
- <value>256, 20</value>
+ <value>227, 20</value>
</data>
<data name="txtAlias.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
@@ -199,7 +223,7 @@
<value>unmanagedPanel</value>
</data>
<data name=">>txtAlias.ZOrder" xml:space="preserve">
- <value>2</value>
+ <value>3</value>
</data>
<data name="unmanagedPanel.Location" type="System.Drawing.Point, System.Drawing">
<value>19, 189</value>
@@ -301,7 +325,7 @@
<value>resDataCtrl</value>
</data>
<data name=">>resDataCtrl.Type" xml:space="preserve">
- <value>Maestro.Editors.Common.ResourceDataCtrl, Maestro.Editors, Version=3.0.0.5610, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.Common.ResourceDataCtrl, Maestro.Editors, Version=3.1.0.5859, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name=">>resDataCtrl.Parent" xml:space="preserve">
<value>contentPanel</value>
@@ -334,6 +358,6 @@
<value>FileBasedCtrl</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>Maestro.Editors.Common.EditorBindableCollapsiblePanel, Maestro.Editors, Version=3.0.0.5610, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.Common.EditorBindableCollapsiblePanel, Maestro.Editors, Version=3.1.0.5859, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>
\ No newline at end of file
More information about the mapguide-commits
mailing list