[mapguide-commits] r5992 - in trunk/Tools/Maestro: Maestro Maestro.Editors/Common

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Thu Jul 21 08:20:44 EDT 2011


Author: jng
Date: 2011-07-21 05:20:44 -0700 (Thu, 21 Jul 2011)
New Revision: 5992

Modified:
   trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.cs
   trunk/Tools/Maestro/Maestro/changelog.txt
Log:
#1739: Show resources in sorted order in the Resource Picker


Modified: trunk/Tools/Maestro/Maestro/changelog.txt
===================================================================
--- trunk/Tools/Maestro/Maestro/changelog.txt	2011-07-21 11:59:31 UTC (rev 5991)
+++ trunk/Tools/Maestro/Maestro/changelog.txt	2011-07-21 12:20:44 UTC (rev 5992)
@@ -1,6 +1,14 @@
-3.5 beta 1
+3.5 beta 2
 ----------
 
+ - Improved AIMS 2012 support
+	- Fix broken support for Layer Definitions using the 2.3.0 schema
+	- Enabled previews for Watermark Definition editor
+ - Show resources in sorted order in the Resource Picker
+
+3.5 beta 1
+----------
+
  - Watermark Definition editor
  - Symbol Definition editor (simple and compound). Currently supports the 1.0.0 schema feature set.
  - Updated Fusion editor to use Google Maps V3

Modified: trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.cs	2011-07-21 11:59:31 UTC (rev 5991)
+++ trunk/Tools/Maestro/Maestro.Editors/Common/ResourcePicker.cs	2011-07-21 12:20:44 UTC (rev 5992)
@@ -322,61 +322,64 @@
         private void PopulateDocumentList(ResourceList list)
         {
             lstResources.Clear();
+            SortedList<string, ResourceListResourceDocument> items = new SortedList<string, ResourceListResourceDocument>();
             foreach (var item in list.Items)
             {
                 var doc = item as ResourceListResourceDocument;
                 if (doc != null)
+                    items.Add(doc.Name, doc);
+            }
+            foreach (var doc in items.Values)
+            {
+                var li = new ListViewItem(doc.Name);
+                li.Tag = doc;
+
+                try
                 {
-                    var li = new ListViewItem(doc.Name);
-                    li.Tag = doc;
-
-                    try
+                    var rt = ResourceIdentifier.GetResourceType(doc.ResourceId);
+                    switch (rt)
                     {
-                        var rt = ResourceIdentifier.GetResourceType(doc.ResourceId);
-                        switch (rt)
-                        {
-                            case ResourceTypes.ApplicationDefinition:
-                                li.ImageIndex = RES_APPLICATIONDEFINITION;
-                                break;
-                            case ResourceTypes.DrawingSource:
-                                li.ImageIndex = RES_DRAWINGSOURCE;
-                                break;
-                            case ResourceTypes.FeatureSource:
-                                li.ImageIndex = RES_FEATURESOURCE;
-                                break;
-                            case ResourceTypes.LayerDefinition:
-                                li.ImageIndex = RES_LAYERDEFINITION;
-                                break;
-                            case ResourceTypes.MapDefinition:
-                                li.ImageIndex = RES_MAPDEFINITION;
-                                break;
-                            case ResourceTypes .PrintLayout:
-                                li.ImageIndex = RES_PRINTLAYOUT;
-                                break;
-                            case ResourceTypes.SymbolLibrary:
-                                li.ImageIndex = RES_SYMBOLLIBRARY;
-                                break;
-                            case ResourceTypes.WebLayout:
-                                li.ImageIndex = RES_WEBLAYOUT;
-                                break;
-                            case ResourceTypes.SymbolDefinition:
-                                li.ImageIndex = RES_SYMBOLDEFINITION;
-                                break;
-                            case ResourceTypes.WatermarkDefinition:
-                                li.ImageIndex = RES_WATERMARK;
-                                break;
-                            default:
-                                li.ImageIndex = RES_UNKNOWN;
-                                break;
-                        }
+                        case ResourceTypes.ApplicationDefinition:
+                            li.ImageIndex = RES_APPLICATIONDEFINITION;
+                            break;
+                        case ResourceTypes.DrawingSource:
+                            li.ImageIndex = RES_DRAWINGSOURCE;
+                            break;
+                        case ResourceTypes.FeatureSource:
+                            li.ImageIndex = RES_FEATURESOURCE;
+                            break;
+                        case ResourceTypes.LayerDefinition:
+                            li.ImageIndex = RES_LAYERDEFINITION;
+                            break;
+                        case ResourceTypes.MapDefinition:
+                            li.ImageIndex = RES_MAPDEFINITION;
+                            break;
+                        case ResourceTypes.PrintLayout:
+                            li.ImageIndex = RES_PRINTLAYOUT;
+                            break;
+                        case ResourceTypes.SymbolLibrary:
+                            li.ImageIndex = RES_SYMBOLLIBRARY;
+                            break;
+                        case ResourceTypes.WebLayout:
+                            li.ImageIndex = RES_WEBLAYOUT;
+                            break;
+                        case ResourceTypes.SymbolDefinition:
+                            li.ImageIndex = RES_SYMBOLDEFINITION;
+                            break;
+                        case ResourceTypes.WatermarkDefinition:
+                            li.ImageIndex = RES_WATERMARK;
+                            break;
+                        default:
+                            li.ImageIndex = RES_UNKNOWN;
+                            break;
                     }
-                    catch
-                    {
-                        li.ImageIndex = RES_UNKNOWN;
-                    }
+                }
+                catch
+                {
+                    li.ImageIndex = RES_UNKNOWN;
+                }
 
-                    lstResources.Items.Add(li);
-                }
+                lstResources.Items.Add(li);
             }
         }
 



More information about the mapguide-commits mailing list