[mapguide-commits] r5785 -
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu May 12 07:33:26 EDT 2011
Author: jng
Date: 2011-05-12 04:33:26 -0700 (Thu, 12 May 2011)
New Revision: 5785
Modified:
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.resx
Log:
#1688: Enable file and alias browsing for Unmanaged file sub-editor
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.Designer.cs 2011-05-12 10:58:09 UTC (rev 5784)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.Designer.cs 2011-05-12 11:33:26 UTC (rev 5785)
@@ -32,6 +32,7 @@
this.label1 = new System.Windows.Forms.Label();
this.txtFilePath = new System.Windows.Forms.TextBox();
this.btnBrowse = new System.Windows.Forms.Button();
+ this.btnBrowseAlias = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// label1
@@ -43,17 +44,28 @@
//
resources.ApplyResources(this.txtFilePath, "txtFilePath");
this.txtFilePath.Name = "txtFilePath";
+ this.txtFilePath.TextChanged += new System.EventHandler(this.txtFilePath_TextChanged);
//
// btnBrowse
//
resources.ApplyResources(this.btnBrowse, "btnBrowse");
this.btnBrowse.Name = "btnBrowse";
this.btnBrowse.UseVisualStyleBackColor = true;
+ this.btnBrowse.Click += new System.EventHandler(this.btnBrowse_Click);
//
+ // btnBrowseAlias
+ //
+ resources.ApplyResources(this.btnBrowseAlias, "btnBrowseAlias");
+ this.btnBrowseAlias.Image = global::Maestro.Editors.Properties.Resources.document;
+ this.btnBrowseAlias.Name = "btnBrowseAlias";
+ this.btnBrowseAlias.UseVisualStyleBackColor = true;
+ this.btnBrowseAlias.Click += new System.EventHandler(this.btnBrowseAlias_Click);
+ //
// UnmanagedCtrl
//
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.btnBrowseAlias);
this.Controls.Add(this.btnBrowse);
this.Controls.Add(this.txtFilePath);
this.Controls.Add(this.label1);
@@ -68,5 +80,6 @@
private System.Windows.Forms.Label label1;
private System.Windows.Forms.TextBox txtFilePath;
private System.Windows.Forms.Button btnBrowse;
+ private System.Windows.Forms.Button btnBrowseAlias;
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.cs 2011-05-12 10:58:09 UTC (rev 5784)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.cs 2011-05-12 11:33:26 UTC (rev 5785)
@@ -25,6 +25,8 @@
using System.Text;
using System.Windows.Forms;
using System.Collections.Specialized;
+using Maestro.Editors.Common;
+using OSGeo.MapGuide.MaestroAPI.Services;
namespace Maestro.Editors.FeatureSource.Providers.Odbc.SubEditors
{
@@ -36,9 +38,12 @@
InitializeComponent();
}
+ private IResourceService _resSvc;
+
public override void Bind(IEditorService service)
{
service.RegisterCustomNotifier(this);
+ _resSvc = service.ResourceService;
}
public Control Content
@@ -105,5 +110,37 @@
}
public event EventHandler ConnectionChanged;
+
+ private void btnBrowse_Click(object sender, EventArgs e)
+ {
+ using (var open = new OpenFileDialog())
+ {
+ open.Filter = Properties.Resources.OdbcDriverAccess + "|*.mdb|" +
+ Properties.Resources.OdbcDriverAccess64 + "|*.accdb|" +
+ Properties.Resources.OdbcDriverExcel + "|*.xls|" +
+ Properties.Resources.OdbcDriverExcel64 + "|*.xlsx, *.xlsm, *.xlsb";
+
+ if (open.ShowDialog() == DialogResult.OK)
+ {
+ txtFilePath.Text = open.FileName;
+ }
+ }
+ }
+
+ private void btnBrowseAlias_Click(object sender, EventArgs e)
+ {
+ using (var picker = new UnmanagedFileBrowser(_resSvc))
+ {
+ if (picker.ShowDialog() == DialogResult.OK)
+ {
+ txtFilePath.Text = picker.SelectedItem;
+ }
+ }
+ }
+
+ private void txtFilePath_TextChanged(object sender, EventArgs e)
+ {
+ OnConnectionChanged();
+ }
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.resx 2011-05-12 10:58:09 UTC (rev 5784)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/Odbc/SubEditors/UnmanagedCtrl.resx 2011-05-12 11:33:26 UTC (rev 5785)
@@ -144,7 +144,7 @@
<value>$this</value>
</data>
<data name=">>label1.ZOrder" xml:space="preserve">
- <value>2</value>
+ <value>3</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="txtFilePath.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
@@ -154,7 +154,7 @@
<value>3, 28</value>
</data>
<data name="txtFilePath.Size" type="System.Drawing.Size, System.Drawing">
- <value>451, 20</value>
+ <value>421, 20</value>
</data>
<data name="txtFilePath.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -169,13 +169,13 @@
<value>$this</value>
</data>
<data name=">>txtFilePath.ZOrder" xml:space="preserve">
- <value>1</value>
+ <value>2</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>460, 26</value>
+ <value>430, 26</value>
</data>
<data name="btnBrowse.Size" type="System.Drawing.Size, System.Drawing">
<value>27, 23</value>
@@ -196,6 +196,33 @@
<value>$this</value>
</data>
<data name=">>btnBrowse.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name="btnBrowseAlias.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+ <value>Top, Right</value>
+ </data>
+ <data name="btnBrowseAlias.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
+ <data name="btnBrowseAlias.Location" type="System.Drawing.Point, System.Drawing">
+ <value>460, 26</value>
+ </data>
+ <data name="btnBrowseAlias.Size" type="System.Drawing.Size, System.Drawing">
+ <value>27, 23</value>
+ </data>
+ <data name="btnBrowseAlias.TabIndex" type="System.Int32, mscorlib">
+ <value>3</value>
+ </data>
+ <data name=">>btnBrowseAlias.Name" xml:space="preserve">
+ <value>btnBrowseAlias</value>
+ </data>
+ <data name=">>btnBrowseAlias.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">
+ <value>$this</value>
+ </data>
+ <data name=">>btnBrowseAlias.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">
@@ -211,6 +238,6 @@
<value>UnmanagedCtrl</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>Maestro.Editors.EditorBase, Maestro.Editors, Version=3.0.0.5475, Culture=neutral, PublicKeyToken=null</value>
+ <value>Maestro.Editors.EditorBase, Maestro.Editors, Version=3.0.0.5728, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>
\ No newline at end of file
More information about the mapguide-commits
mailing list