[mapguide-commits] r6748 - in trunk/Tools/Maestro/Maestro.Editors: FeatureSource/Preview Properties

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Mon Jun 11 04:47:09 PDT 2012


Author: jng
Date: 2012-06-11 04:47:09 -0700 (Mon, 11 Jun 2012)
New Revision: 6748

Modified:
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/LocalFeatureSourcePreviewCtrl.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/LocalFeatureSourcePreviewCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/LocalFeatureSourcePreviewCtrl.resx
   trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx
Log:
#2004: Do not full schema walk when presenting the schema tree in the Feature Source Preview. Lazy load our nodes like we do in FDO Toolbox

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/LocalFeatureSourcePreviewCtrl.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/LocalFeatureSourcePreviewCtrl.Designer.cs	2012-06-11 11:11:59 UTC (rev 6747)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/LocalFeatureSourcePreviewCtrl.Designer.cs	2012-06-11 11:47:09 UTC (rev 6748)
@@ -40,6 +40,7 @@
             this.btnStandard = new System.Windows.Forms.ToolStripButton();
             this.btnClose = new System.Windows.Forms.ToolStripButton();
             this.tabPreviews = new System.Windows.Forms.TabControl();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
             this.splitContainer1.Panel1.SuspendLayout();
             this.splitContainer1.Panel2.SuspendLayout();
             this.splitContainer1.SuspendLayout();
@@ -66,6 +67,7 @@
             this.trvSchema.ImageList = this.schemaImageList;
             this.trvSchema.Name = "trvSchema";
             this.trvSchema.ShowNodeToolTips = true;
+            this.trvSchema.AfterExpand += new System.Windows.Forms.TreeViewEventHandler(this.trvSchema_AfterExpand);
             this.trvSchema.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.trvSchema_AfterSelect);
             // 
             // schemaImageList
@@ -142,6 +144,7 @@
             this.splitContainer1.Panel1.ResumeLayout(false);
             this.splitContainer1.Panel1.PerformLayout();
             this.splitContainer1.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
             this.splitContainer1.ResumeLayout(false);
             this.toolStrip1.ResumeLayout(false);
             this.toolStrip1.PerformLayout();

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/LocalFeatureSourcePreviewCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/LocalFeatureSourcePreviewCtrl.cs	2012-06-11 11:11:59 UTC (rev 6747)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/LocalFeatureSourcePreviewCtrl.cs	2012-06-11 11:47:09 UTC (rev 6748)
@@ -77,6 +77,39 @@
 
         private FdoProviderCapabilities _caps;
 
+        class SchemaNodeTag
+        {
+            public string SchemaName { get; set; }
+
+            public bool Loaded { get; set; }
+
+            public SchemaNodeTag(string name)
+            {
+                this.SchemaName = name;
+                this.Loaded = false;
+            }
+        }
+
+        class ClassNodeTag
+        {
+            public string SchemaName { get; set; }
+
+            public string ClassName { get; set; }
+
+            public string QualifiedName { get { return this.SchemaName + ":" + this.ClassName; } }
+
+            public ClassDefinition Class { get; set; }
+
+            public bool Loaded { get; set; }
+
+            public ClassNodeTag(string schemaName, string className)
+            {
+                this.SchemaName = schemaName;
+                this.ClassName = className;
+                this.Loaded = false;
+            }
+        }
+
         /// <summary>
         /// Reloads the tree.
         /// </summary>
@@ -88,108 +121,101 @@
             _caps = caps;
             ClearPreviewPanes();
             trvSchema.Nodes.Clear();
-            
-            //FIXME: Do this lazily ala. FDO Toolbox
-            var schema = _fsvc.DescribeFeatureSource(currentFsId);
 
-            Dictionary<string, List<ClassDefinition>> classes = new Dictionary<string, List<ClassDefinition>>();
-            foreach (var cls in schema.AllClasses)
-            {
-                string[] tokens = cls.QualifiedName.Split(':');
-                if (!classes.ContainsKey(tokens[0]))
-                    classes[tokens[0]] = new List<ClassDefinition>();
-
-                classes[tokens[0]].Add(cls);
-            }
-
-            string[] schemaNames = schema.SchemaNames;
+            string[] schemaNames = _fsvc.GetSchemas(currentFsId);
             foreach (var s in schemaNames)
             {
                 var schemaNode = new TreeNode(s);
-                schemaNode.Tag = s;
+                schemaNode.Tag = new SchemaNodeTag(s);
                 schemaNode.ImageIndex = schemaNode.SelectedImageIndex = IDX_SCHEMA;
-
+                schemaNode.Nodes.Add(Properties.Resources.TextLoading);
                 trvSchema.Nodes.Add(schemaNode);
+            }
+        }
 
-                if (classes.ContainsKey(s))
-                {
-                    foreach (var cls in classes[s])
-                    {
-                        var classNode = new TreeNode(cls.Name);
-                        classNode.Text = cls.Name;
-                        classNode.Tag = cls;
-                        classNode.ImageIndex = classNode.SelectedImageIndex = IDX_CLASS;
+        private static void UpdateClassNode(TreeNode classNode, ClassDefinition cls)
+        {
+            //var classNode = new TreeNode(cls.Name);
+            classNode.Nodes.Clear();
+            classNode.Name = cls.Name;
+            classNode.Text = cls.Name;
+            var clsTag = classNode.Tag as ClassNodeTag;
+            if (clsTag == null)
+            {
+                classNode.Tag = new ClassNodeTag(cls.Parent.Name, cls.Name) { Loaded = true, Class = cls };
+            }
+            else
+            {
+                clsTag.Loaded = true;
+                clsTag.Class = cls;
+            }
+            classNode.ImageIndex = classNode.SelectedImageIndex = IDX_CLASS;
 
-                        classNode.ToolTipText = string.Format(Properties.Resources.FsPreview_ClassNodeTooltip,
-                            cls.Name,
-                            cls.Description,
-                            cls.DefaultGeometryPropertyName,
-                            Environment.NewLine);
+            classNode.ToolTipText = string.Format(Properties.Resources.FsPreview_ClassNodeTooltip,
+                cls.Name,
+                cls.Description,
+                cls.DefaultGeometryPropertyName,
+                Environment.NewLine);
 
-                        foreach (var prop in cls.Properties)
-                        {
-                            var propNode = new TreeNode(prop.Name);
-                            propNode.Text = prop.Name;
-                            propNode.Tag = prop;
+            foreach (var prop in cls.Properties)
+            {
+                var propNode = new TreeNode(prop.Name);
+                propNode.Text = prop.Name;
+                propNode.Tag = prop;
 
-                            if (prop.Type == PropertyDefinitionType.Geometry)
-                            {
-                                var g = (GeometricPropertyDefinition)prop;
-                                propNode.ImageIndex = propNode.SelectedImageIndex = IDX_GEOMETRY;
-                                propNode.ToolTipText = string.Format(Properties.Resources.FsPreview_GeometryPropertyNodeTooltip,
-                                    g.Name,
-                                    g.Description,
-                                    g.GeometryTypesToString(),
-                                    g.IsReadOnly,
-                                    g.HasElevation,
-                                    g.HasMeasure,
-                                    g.SpatialContextAssociation,
-                                    Environment.NewLine);
-                            }
-                            else if (prop.Type == PropertyDefinitionType.Data)
-                            {
-                                var d = (DataPropertyDefinition)prop;
-                                if (cls.IdentityProperties.Contains((DataPropertyDefinition)prop))
-                                    propNode.ImageIndex = propNode.SelectedImageIndex = IDX_IDENTITY;
-                                else
-                                    propNode.ImageIndex = propNode.SelectedImageIndex = IDX_PROP;
+                if (prop.Type == PropertyDefinitionType.Geometry)
+                {
+                    var g = (GeometricPropertyDefinition)prop;
+                    propNode.ImageIndex = propNode.SelectedImageIndex = IDX_GEOMETRY;
+                    propNode.ToolTipText = string.Format(Properties.Resources.FsPreview_GeometryPropertyNodeTooltip,
+                        g.Name,
+                        g.Description,
+                        g.GeometryTypesToString(),
+                        g.IsReadOnly,
+                        g.HasElevation,
+                        g.HasMeasure,
+                        g.SpatialContextAssociation,
+                        Environment.NewLine);
+                }
+                else if (prop.Type == PropertyDefinitionType.Data)
+                {
+                    var d = (DataPropertyDefinition)prop;
+                    if (cls.IdentityProperties.Contains((DataPropertyDefinition)prop))
+                        propNode.ImageIndex = propNode.SelectedImageIndex = IDX_IDENTITY;
+                    else
+                        propNode.ImageIndex = propNode.SelectedImageIndex = IDX_PROP;
 
-                                propNode.ToolTipText = string.Format(Properties.Resources.FsPreview_DataPropertyNodeTooltip,
-                                    d.Name,
-                                    d.Description,
-                                    d.DataType.ToString(),
-                                    d.IsNullable,
-                                    d.IsReadOnly,
-                                    d.Length,
-                                    d.Precision,
-                                    d.Scale,
-                                    Environment.NewLine);
-                            }
-                            else if (prop.Type == PropertyDefinitionType.Raster)
-                            {
-                                var r = (RasterPropertyDefinition)prop;
-                                propNode.ImageIndex = propNode.SelectedImageIndex = IDX_RASTER;
+                    propNode.ToolTipText = string.Format(Properties.Resources.FsPreview_DataPropertyNodeTooltip,
+                        d.Name,
+                        d.Description,
+                        d.DataType.ToString(),
+                        d.IsNullable,
+                        d.IsReadOnly,
+                        d.Length,
+                        d.Precision,
+                        d.Scale,
+                        Environment.NewLine);
+                }
+                else if (prop.Type == PropertyDefinitionType.Raster)
+                {
+                    var r = (RasterPropertyDefinition)prop;
+                    propNode.ImageIndex = propNode.SelectedImageIndex = IDX_RASTER;
 
-                                propNode.ToolTipText = string.Format(Properties.Resources.FsPreview_RasterPropertyNodeTooltip,
-                                    r.Name,
-                                    r.Description,
-                                    r.IsNullable,
-                                    r.DefaultImageXSize,
-                                    r.DefaultImageYSize,
-                                    r.SpatialContextAssociation,
-                                    Environment.NewLine);
-                            }
-                            else
-                            {
-                                propNode.ImageIndex = propNode.SelectedImageIndex = IDX_PROP;
-                            }
+                    propNode.ToolTipText = string.Format(Properties.Resources.FsPreview_RasterPropertyNodeTooltip,
+                        r.Name,
+                        r.Description,
+                        r.IsNullable,
+                        r.DefaultImageXSize,
+                        r.DefaultImageYSize,
+                        r.SpatialContextAssociation,
+                        Environment.NewLine);
+                }
+                else
+                {
+                    propNode.ImageIndex = propNode.SelectedImageIndex = IDX_PROP;
+                }
 
-                            classNode.Nodes.Add(propNode);
-                        }
-
-                        schemaNode.Nodes.Add(classNode);
-                    }
-                }
+                classNode.Nodes.Add(propNode);
             }
         }
 
@@ -260,7 +286,9 @@
         {
             if (trvSchema.SelectedNode != null)
             {
-                return trvSchema.SelectedNode.Tag as ClassDefinition;
+                var tag = trvSchema.SelectedNode.Tag as ClassNodeTag;
+                if (tag != null)
+                    return tag.Class;
             }
             return null;
         }
@@ -270,12 +298,17 @@
             switch (e.Node.Level)
             {
                 case 1: //Class
-                    var cls = e.Node.Tag as ClassDefinition;
-                    if (cls != null)
+                    var cls = e.Node.Tag as ClassNodeTag;
+                    if (cls != null && cls.Class != null)
                     {
                         btnStandard.Enabled = true;
                         btnSql.Enabled = this.SupportsSQL;
                     }
+                    else
+                    {
+                        btnStandard.Enabled = false;
+                        btnSql.Enabled = false;
+                    }
                     break;
                 default:
                     btnStandard.Enabled = false;
@@ -323,5 +356,42 @@
                 btnClose.Enabled = (tabPreviews.TabPages.Count > 0);
             }
         }
+
+        private void trvSchema_AfterExpand(object sender, TreeViewEventArgs e)
+        {
+            var schTag = e.Node.Tag as SchemaNodeTag;
+            var clsTag = e.Node.Tag as ClassNodeTag;
+            if (schTag != null)
+            {
+                if (schTag.Loaded)
+                    return;
+
+                e.Node.Nodes.Clear();
+
+                var classNames = _fsvc.GetClassNames(currentFsId, schTag.SchemaName);
+                foreach (var qClsName in classNames)
+                {
+                    var clsName = qClsName.Split(':')[1];
+                    var node = new TreeNode(clsName);
+                    node.Text = clsName;
+                    node.Tag = new ClassNodeTag(schTag.SchemaName, clsName);
+                    node.ImageIndex = node.SelectedImageIndex = IDX_CLASS;
+                    node.Nodes.Add(Properties.Resources.TextLoading);
+
+                    e.Node.Nodes.Add(node);
+                }
+
+                schTag.Loaded = true;
+            }
+            else if (clsTag != null)
+            {
+                if (clsTag.Loaded)
+                    return;
+
+                var cls = _fsvc.GetClassDefinition(currentFsId, clsTag.QualifiedName);
+                clsTag.Class = cls;
+                UpdateClassNode(e.Node, cls);
+            }
+        }
     }
 }

Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/LocalFeatureSourcePreviewCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/LocalFeatureSourcePreviewCtrl.resx	2012-06-11 11:11:59 UTC (rev 6747)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/LocalFeatureSourcePreviewCtrl.resx	2012-06-11 11:47:09 UTC (rev 6748)
@@ -112,35 +112,35 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="splitContainer1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="splitContainer1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
   <data name="trvSchema.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="trvSchema.ImageIndex" type="System.Int32, mscorlib">
     <value>0</value>
   </data>
-  <metadata name="schemaImageList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="schemaImageList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>116, 17</value>
   </metadata>
   <data name="schemaImageList.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAw
-        DQAAAk1TRnQBSQFMAgEBBgEAASwBAAEsAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        DQAAAk1TRnQBSQFMAgEBBgEAATQBAAE0AQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -215,7 +215,7 @@
     <value>trvSchema</value>
   </data>
   <data name=">>trvSchema.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TreeView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.TreeView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name=">>trvSchema.Parent" xml:space="preserve">
     <value>splitContainer1.Panel1</value>
@@ -223,7 +223,7 @@
   <data name=">>trvSchema.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>0, 0</value>
   </metadata>
   <data name="btnRefresh.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
@@ -290,7 +290,7 @@
     <value>toolStrip1</value>
   </data>
   <data name=">>toolStrip1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name=">>toolStrip1.Parent" xml:space="preserve">
     <value>splitContainer1.Panel1</value>
@@ -302,7 +302,7 @@
     <value>splitContainer1.Panel1</value>
   </data>
   <data name=">>splitContainer1.Panel1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name=">>splitContainer1.Panel1.Parent" xml:space="preserve">
     <value>splitContainer1</value>
@@ -326,7 +326,7 @@
     <value>tabPreviews</value>
   </data>
   <data name=">>tabPreviews.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name=">>tabPreviews.Parent" xml:space="preserve">
     <value>splitContainer1.Panel2</value>
@@ -338,7 +338,7 @@
     <value>splitContainer1.Panel2</value>
   </data>
   <data name=">>splitContainer1.Panel2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name=">>splitContainer1.Panel2.Parent" xml:space="preserve">
     <value>splitContainer1</value>
@@ -359,7 +359,7 @@
     <value>splitContainer1</value>
   </data>
   <data name=">>splitContainer1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name=">>splitContainer1.Parent" xml:space="preserve">
     <value>$this</value>
@@ -367,7 +367,7 @@
   <data name=">>splitContainer1.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">
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
@@ -377,42 +377,42 @@
     <value>schemaImageList</value>
   </data>
   <data name=">>schemaImageList.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ImageList, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.ImageList, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name=">>btnRefresh.Name" xml:space="preserve">
     <value>btnRefresh</value>
   </data>
   <data name=">>btnRefresh.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name=">>toolStripSeparator1.Name" xml:space="preserve">
     <value>toolStripSeparator1</value>
   </data>
   <data name=">>toolStripSeparator1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name=">>btnSql.Name" xml:space="preserve">
     <value>btnSql</value>
   </data>
   <data name=">>btnSql.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name=">>btnStandard.Name" xml:space="preserve">
     <value>btnStandard</value>
   </data>
   <data name=">>btnStandard.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name=">>btnClose.Name" xml:space="preserve">
     <value>btnClose</value>
   </data>
   <data name=">>btnClose.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name=">>$this.Name" xml:space="preserve">
     <value>LocalFeatureSourcePreviewCtrl</value>
   </data>
   <data name=">>$this.Type" xml:space="preserve">
-    <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
 </root>
\ No newline at end of file

Modified: trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs	2012-06-11 11:11:59 UTC (rev 6747)
+++ trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.Designer.cs	2012-06-11 11:47:09 UTC (rev 6748)
@@ -3235,6 +3235,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Loading.
+        /// </summary>
+        internal static string TextLoading {
+            get {
+                return ResourceManager.GetString("TextLoading", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to No Items Selected.
         /// </summary>
         internal static string TextNoItemSelected {

Modified: trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx	2012-06-11 11:11:59 UTC (rev 6747)
+++ trunk/Tools/Maestro/Maestro.Editors/Properties/Resources.resx	2012-06-11 11:47:09 UTC (rev 6748)
@@ -5698,4 +5698,7 @@
   <data name="TextPreparingConfigurationDocument" xml:space="preserve">
     <value>Preparing Configuration Document</value>
   </data>
+  <data name="TextLoading" xml:space="preserve">
+    <value>Loading</value>
+  </data>
 </root>
\ No newline at end of file



More information about the mapguide-commits mailing list