[mapguide-commits] r8061 - in trunk/Tools/Maestro/Maestro.Editors: . FeatureSource/Preview
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Apr 17 22:07:28 PDT 2014
Author: jng
Date: 2014-04-17 22:07:27 -0700 (Thu, 17 Apr 2014)
New Revision: 8061
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/Strings.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/Strings.resx
Log:
Feature Source Preview changes:
- Fix tooltip text for close active tab button
- Load schema names, class names and class definitions in background workers
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/LocalFeatureSourcePreviewCtrl.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/LocalFeatureSourcePreviewCtrl.Designer.cs 2014-04-18 04:28:45 UTC (rev 8060)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/LocalFeatureSourcePreviewCtrl.Designer.cs 2014-04-18 05:07:27 UTC (rev 8061)
@@ -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();
@@ -143,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 2014-04-18 04:28:45 UTC (rev 8060)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/LocalFeatureSourcePreviewCtrl.cs 2014-04-18 05:07:27 UTC (rev 8061)
@@ -29,6 +29,7 @@
using OSGeo.MapGuide.ObjectModels.FeatureSource;
using OSGeo.MapGuide.ObjectModels.Capabilities;
using OSGeo.MapGuide.MaestroAPI.Schema;
+using Maestro.Shared.UI;
namespace Maestro.Editors.FeatureSource.Preview
{
@@ -122,15 +123,26 @@
ClearPreviewPanes();
trvSchema.Nodes.Clear();
- string[] schemaNames = _edSvc.FeatureService.GetSchemas(currentFsId);
- foreach (var s in schemaNames)
- {
- var schemaNode = new TreeNode(s);
- schemaNode.Tag = new SchemaNodeTag(s);
- schemaNode.ImageIndex = schemaNode.SelectedImageIndex = IDX_SCHEMA;
- schemaNode.Nodes.Add(Strings.TextLoading);
- trvSchema.Nodes.Add(schemaNode);
- }
+ BusyWaitDialog.Run(Strings.FetchingSchemaNames, () => {
+ return _edSvc.FeatureService.GetSchemas(currentFsId);
+ }, (res, ex) => {
+ if (ex != null)
+ {
+ ErrorDialog.Show(ex);
+ }
+ else
+ {
+ string[] schemaNames = (string[])res;
+ foreach (var s in schemaNames)
+ {
+ var schemaNode = new TreeNode(s);
+ schemaNode.Tag = new SchemaNodeTag(s);
+ schemaNode.ImageIndex = schemaNode.SelectedImageIndex = IDX_SCHEMA;
+ schemaNode.Nodes.Add(Strings.TextLoading);
+ trvSchema.Nodes.Add(schemaNode);
+ }
+ }
+ });
}
private static void UpdateClassNode(TreeNode classNode, ClassDefinition cls)
@@ -368,29 +380,53 @@
e.Node.Nodes.Clear();
- var classNames = _edSvc.FeatureService.GetClassNames(currentFsId, schTag.SchemaName);
- foreach (var qClsName in classNames)
- {
- var clsName = qClsName.Split(':')[1]; //NOXLATE
- var node = new TreeNode(clsName);
- node.Text = clsName;
- node.Tag = new ClassNodeTag(schTag.SchemaName, clsName);
- node.ImageIndex = node.SelectedImageIndex = IDX_CLASS;
- node.Nodes.Add(Strings.TextLoading);
+ string schemaName = schTag.SchemaName;
+ BusyWaitDialog.Run(Strings.FetchingClassNames, () => {
+ return _edSvc.FeatureService.GetClassNames(currentFsId, schemaName);
+ }, (res, ex) => {
+ if (ex != null)
+ {
+ ErrorDialog.Show(ex);
+ }
+ else
+ {
+ var classNames = (string[])res;
+ foreach (var qClsName in classNames)
+ {
+ var clsName = qClsName.Split(':')[1]; //NOXLATE
+ var node = new TreeNode(clsName);
+ node.Text = clsName;
+ node.Tag = new ClassNodeTag(schTag.SchemaName, clsName);
+ node.ImageIndex = node.SelectedImageIndex = IDX_CLASS;
+ node.Nodes.Add(Strings.TextLoading);
- e.Node.Nodes.Add(node);
- }
+ e.Node.Nodes.Add(node);
+ }
- schTag.Loaded = true;
+ schTag.Loaded = true;
+ }
+ });
}
else if (clsTag != null)
{
if (clsTag.Loaded)
return;
- var cls = _edSvc.FeatureService.GetClassDefinition(currentFsId, clsTag.QualifiedName);
- clsTag.Class = cls;
- UpdateClassNode(e.Node, cls);
+ string classNameQualified = clsTag.QualifiedName;
+ BusyWaitDialog.Run(Strings.FetchingClassDefinition, () => {
+ return _edSvc.FeatureService.GetClassDefinition(currentFsId, classNameQualified);
+ }, (res, ex) => {
+ if (ex != null)
+ {
+ ErrorDialog.Show(ex);
+ }
+ else
+ {
+ var cls = (ClassDefinition)res;
+ 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 2014-04-18 04:28:45 UTC (rev 8060)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Preview/LocalFeatureSourcePreviewCtrl.resx 2014-04-18 05:07:27 UTC (rev 8061)
@@ -140,7 +140,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAw
- DQAAAk1TRnQBSQFMAgEBBgEAATQBAAE0AQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ DQAAAk1TRnQBSQFMAgEBBgEAATwBAAE8AQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -272,7 +272,7 @@
<value>23, 22</value>
</data>
<data name="btnClose.Text" xml:space="preserve">
- <value>toolStripButton1</value>
+ <value>Close the active tab</value>
</data>
<data name="toolStrip1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
Modified: trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs 2014-04-18 04:28:45 UTC (rev 8060)
+++ trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs 2014-04-18 05:07:27 UTC (rev 8061)
@@ -727,6 +727,33 @@
}
/// <summary>
+ /// Looks up a localized string similar to Fetching Class Definition.
+ /// </summary>
+ internal static string FetchingClassDefinition {
+ get {
+ return ResourceManager.GetString("FetchingClassDefinition", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Fetching Class Names.
+ /// </summary>
+ internal static string FetchingClassNames {
+ get {
+ return ResourceManager.GetString("FetchingClassNames", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Fetching Schema Names.
+ /// </summary>
+ internal static string FetchingSchemaNames {
+ get {
+ return ResourceManager.GetString("FetchingSchemaNames", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to This field is required: {0}.
/// </summary>
internal static string FieldRequired {
Modified: trunk/Tools/Maestro/Maestro.Editors/Strings.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Strings.resx 2014-04-18 04:28:45 UTC (rev 8060)
+++ trunk/Tools/Maestro/Maestro.Editors/Strings.resx 2014-04-18 05:07:27 UTC (rev 8061)
@@ -1581,4 +1581,13 @@
<data name="WarningUnconfiguredWmsFeatureSource" xml:space="preserve">
<value>Your WMS Feature Source is not configured. An un-configured WMS Feature Source may not properly read layer information from your WMS Server. Click "Advanced" after testing your connection to build a default document.</value>
</data>
+ <data name="FetchingClassDefinition" xml:space="preserve">
+ <value>Fetching Class Definition</value>
+ </data>
+ <data name="FetchingClassNames" xml:space="preserve">
+ <value>Fetching Class Names</value>
+ </data>
+ <data name="FetchingSchemaNames" xml:space="preserve">
+ <value>Fetching Schema Names</value>
+ </data>
</root>
\ No newline at end of file
More information about the mapguide-commits
mailing list