[mapguide-commits] r6527 - trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-02-18 22:08:04 -0800 (Sat, 18 Feb 2012)
New Revision: 6527

Modified:
   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
Log:
#1798: Make the browse button in the Drawing Source editor do its intended function instead of doing nothing.

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.Designer.cs	2012-02-19 04:44:13 UTC (rev 6526)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.Designer.cs	2012-02-19 06:08:04 UTC (rev 6527)
@@ -71,6 +71,7 @@
             resources.ApplyResources(this.btnBrowse, "btnBrowse");
             this.btnBrowse.Name = "btnBrowse";
             this.btnBrowse.UseVisualStyleBackColor = true;
+            this.btnBrowse.Click += new System.EventHandler(this.btnBrowse_Click);
             // 
             // groupBox1
             // 

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.cs	2012-02-19 04:44:13 UTC (rev 6526)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.cs	2012-02-19 06:08:04 UTC (rev 6527)
@@ -27,6 +27,7 @@
 using Maestro.Shared.UI;
 using System.Diagnostics;
 using OSGeo.MapGuide.ObjectModels.LayerDefinition;
+using Maestro.Editors.Generic;
 
 namespace Maestro.Editors.LayerDefinition.Drawing
 {
@@ -36,10 +37,12 @@
         public DrawingLayerSettingsCtrl()
         {
             InitializeComponent();
+            _sheets = new BindingList<OSGeo.MapGuide.ObjectModels.Common.DrawingSectionListSection>();
         }
 
         private IEditorService _service;
         private IDrawingLayerDefinition _dlayer;
+        private BindingList<OSGeo.MapGuide.ObjectModels.Common.DrawingSectionListSection> _sheets;
 
         public void Bind(IEditorService service)
         {
@@ -53,12 +56,13 @@
             Debug.Assert(_dlayer != null);
 
             TextBoxBinder.BindText(txtDrawingSource, _dlayer, "ResourceId");
-
-            var sheets = _service.DrawingService.EnumerateDrawingSections(_dlayer.ResourceId);
             cmbSheet.DisplayMember = "Title";
             cmbSheet.ValueMember = "Name";
+            cmbSheet.DataSource = _sheets;
+            PopulateSheets();
+            cmbSheet_SelectedIndexChanged(this, EventArgs.Empty);
             ComboBoxBinder.BindSelectedIndexChanged(cmbSheet, "SelectedValue", _dlayer, "Sheet");
-            cmbSheet.DataSource = sheets.Section;
+            
 
             var minBinding = new Binding("Text", _dlayer, "MinScale");
             var maxBinding = new Binding("Text", _dlayer, "MaxScale");
@@ -101,6 +105,16 @@
             _dlayer.PropertyChanged += (sender, e) => { OnResourceChanged(); };
         }
 
+        private void PopulateSheets()
+        {
+            _sheets.Clear();
+            var sheets = _service.DrawingService.EnumerateDrawingSections(_dlayer.ResourceId);
+            foreach (var sht in sheets.Section)
+            {
+                _sheets.Add(sht);
+            }
+        }
+
         private void OnResourceChanged()
         {
             var handler = this.ResourceChanged;
@@ -180,5 +194,25 @@
         {
             _service.OpenResource(txtDrawingSource.Text);
         }
+
+        private void btnBrowse_Click(object sender, EventArgs e)
+        {
+            using (var picker = new ResourcePicker(_service.ResourceService, 
+                                                   OSGeo.MapGuide.MaestroAPI.ResourceTypes.DrawingSource, 
+                                                   ResourcePickerMode.OpenResource))
+            {
+                if (picker.ShowDialog() == DialogResult.OK)
+                {
+                    if (!txtDrawingSource.Text.Equals(picker.ResourceID))
+                    {
+                        txtDrawingSource.Text = picker.ResourceID;
+                        _dlayer.LayerFilter = string.Empty;
+                        PopulateSheets();
+                        _dlayer.Sheet = _sheets[0].Name;
+                        cmbSheet_SelectedIndexChanged(this, EventArgs.Empty);
+                    }
+                }
+            }
+        }
     }
 }

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.resx	2012-02-19 04:44:13 UTC (rev 6526)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/Drawing/DrawingLayerSettingsCtrl.resx	2012-02-19 06:08:04 UTC (rev 6527)
@@ -502,6 +502,6 @@
     <value>DrawingLayerSettingsCtrl</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>Maestro.Shared.UI.CollapsiblePanel, Maestro.Shared.UI, Version=4.0.0.6359, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+    <value>Maestro.Shared.UI.CollapsiblePanel, Maestro.Shared.UI, Version=5.0.0.6514, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
   </data>
 </root>
\ No newline at end of file