[mapguide-commits] r6209 - trunk/Tools/Maestro/Maestro.Editors/Common

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Tue Nov 8 10:08:40 EST 2011


Author: jng
Date: 2011-11-08 07:08:40 -0800 (Tue, 08 Nov 2011)
New Revision: 6209

Modified:
   trunk/Tools/Maestro/Maestro.Editors/Common/ResourceDataCtrl.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/ResourceDataCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/Common/ResourceDataCtrl.resx
Log:
#1829: Support deleting of multiple resource data items

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/ResourceDataCtrl.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ResourceDataCtrl.Designer.cs	2011-11-08 14:57:45 UTC (rev 6208)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ResourceDataCtrl.Designer.cs	2011-11-08 15:08:40 UTC (rev 6209)
@@ -82,7 +82,6 @@
             // 
             this.lstDataFiles.AllowDrop = true;
             resources.ApplyResources(this.lstDataFiles, "lstDataFiles");
-            this.lstDataFiles.MultiSelect = false;
             this.lstDataFiles.Name = "lstDataFiles";
             this.lstDataFiles.ShowItemToolTips = true;
             this.lstDataFiles.SmallImageList = this.imgIcons;

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/ResourceDataCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ResourceDataCtrl.cs	2011-11-08 14:57:45 UTC (rev 6208)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ResourceDataCtrl.cs	2011-11-08 15:08:40 UTC (rev 6209)
@@ -55,10 +55,11 @@
 
         private void EvaluateCommands()
         {
+            var items = this.SelectedItems;
             btnAdd.Enabled = (_edSvc != null);
-            btnDelete.Enabled = (_edSvc != null && this.SelectedItem != null);
-            btnDownload.Enabled = (_edSvc != null && this.SelectedItem != null);
-            btnMark.Enabled = (this.SelectedItem != null);
+            btnDelete.Enabled = (_edSvc != null && items.Length > 0);
+            btnDownload.Enabled = (_edSvc != null && items.Length == 1);
+            btnMark.Enabled = (items.Length == 1);
         }
 
         private IEditorService _edSvc;
@@ -77,6 +78,19 @@
             }
         }
 
+        private ResourceDataListResourceData[] SelectedItems
+        {
+            get
+            {
+                var items = new List<ResourceDataListResourceData>();
+                foreach(ListViewItem selItem in lstDataFiles.SelectedItems)
+                {
+                    items.Add(selItem.Tag as ResourceDataListResourceData);
+                }
+                return items.ToArray();
+            }
+        }
+
         /// <summary>
         /// Raises the <see cref="E:System.Windows.Forms.UserControl.Load"/> event.
         /// </summary>
@@ -202,8 +216,8 @@
 
         private void btnDelete_Click(object sender, EventArgs e)
         {
-            var item = this.SelectedItem;
-            if (item != null)
+            var items = this.SelectedItems;
+            if (items.Length > 0)
             {
                 if (MessageBox.Show(Properties.Resources.ConfirmDeleteResourceData, Properties.Resources.Confirm, MessageBoxButtons.YesNo) == DialogResult.No)
                     return;
@@ -212,10 +226,13 @@
                 {
                     using (new WaitCursor(this))
                     {
-                        //_edSvc.RemoveResourceData(item.Name);
-                        IResource res = _edSvc.GetEditedResource();
-                        res.DeleteResourceData(item.Name);
-                        _data.Remove(item);
+                        foreach (var item in items)
+                        {
+                            //_edSvc.RemoveResourceData(item.Name);
+                            IResource res = _edSvc.GetEditedResource();
+                            res.DeleteResourceData(item.Name);
+                            _data.Remove(item);
+                        }
                         BindResourceList();
                         OnDataListChanged();
                     }

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/ResourceDataCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ResourceDataCtrl.resx	2011-11-08 14:57:45 UTC (rev 6208)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ResourceDataCtrl.resx	2011-11-08 15:08:40 UTC (rev 6209)
@@ -118,7 +118,7 @@
     <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>17, 17</value>
+    <value>0, 0</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="btnAdd.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
@@ -203,7 +203,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAK
-        CAAAAk1TRnQBSQFMAwEBAAEwAQABMAEAARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
+        CAAAAk1TRnQBSQFMAwEBAAE4AQABOAEAARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
         AUADAAEQAwABAQEAAQgGAAEEGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA
         AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA
         AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm



More information about the mapguide-commits mailing list