[mapguide-commits] r5603 - in sandbox/maestro-3.0: Maestro.Editors Maestro.Editors/FeatureSource/Providers/Gdal Maestro.Editors/Properties Maestro.Editors/Resources OSGeo.MapGuide.MaestroAPI/ObjectModels OSGeo.MapGuide.MaestroAPI/SchemaOverrides

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Mon Mar 7 08:47:28 EST 2011


Author: jng
Date: 2011-03-07 05:47:28 -0800 (Mon, 07 Mar 2011)
New Revision: 5603

Added:
   sandbox/maestro-3.0/Maestro.Editors/Resources/document.png
Modified:
   sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.Designer.cs
   sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.cs
   sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.resx
   sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Gdal/GdalProviderCtrl.cs
   sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Gdal/SingleFileCtrl.Designer.cs
   sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Gdal/SingleFileCtrl.cs
   sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Gdal/SingleFileCtrl.resx
   sandbox/maestro-3.0/Maestro.Editors/Maestro.Editors.csproj
   sandbox/maestro-3.0/Maestro.Editors/Properties/Resources.Designer.cs
   sandbox/maestro-3.0/Maestro.Editors/Properties/Resources.resx
   sandbox/maestro-3.0/OSGeo.MapGuide.MaestroAPI/ObjectModels/IFdoSpatialContext.cs
   sandbox/maestro-3.0/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/GdalRasterItem.cs
Log:
Submit additional work on the GDAL feature source editor

Modified: sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.Designer.cs
===================================================================
--- sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.Designer.cs	2011-03-07 09:24:36 UTC (rev 5602)
+++ sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.Designer.cs	2011-03-07 13:47:28 UTC (rev 5603)
@@ -32,12 +32,15 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CompositeFileCtrl));
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();
             this.btnAdd = new System.Windows.Forms.ToolStripSplitButton();
+            this.browseFilesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.browseFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.btnDelete = new System.Windows.Forms.ToolStripButton();
-            this.btnRefresh = new System.Windows.Forms.ToolStripButton();
             this.lstView = new System.Windows.Forms.ListView();
             this.imgList = new System.Windows.Forms.ImageList(this.components);
             this.label1 = new System.Windows.Forms.Label();
             this.btnRebuild = new System.Windows.Forms.Button();
+            this.folderBrowserDialog = new System.Windows.Forms.FolderBrowserDialog();
+            this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
             this.toolStrip1.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -45,8 +48,7 @@
             // 
             this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.btnAdd,
-            this.btnDelete,
-            this.btnRefresh});
+            this.btnDelete});
             this.toolStrip1.Location = new System.Drawing.Point(0, 0);
             this.toolStrip1.Name = "toolStrip1";
             this.toolStrip1.Size = new System.Drawing.Size(504, 25);
@@ -55,12 +57,31 @@
             // 
             // btnAdd
             // 
+            this.btnAdd.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.browseFilesToolStripMenuItem,
+            this.browseFolderToolStripMenuItem});
             this.btnAdd.Image = global::Maestro.Editors.Properties.Resources.plus_circle;
             this.btnAdd.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.btnAdd.Name = "btnAdd";
             this.btnAdd.Size = new System.Drawing.Size(61, 22);
             this.btnAdd.Text = "Add";
             // 
+            // browseFilesToolStripMenuItem
+            // 
+            this.browseFilesToolStripMenuItem.Image = global::Maestro.Editors.Properties.Resources.document;
+            this.browseFilesToolStripMenuItem.Name = "browseFilesToolStripMenuItem";
+            this.browseFilesToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.browseFilesToolStripMenuItem.Text = "Browse Files";
+            this.browseFilesToolStripMenuItem.Click += new System.EventHandler(this.browseFilesToolStripMenuItem_Click);
+            // 
+            // browseFolderToolStripMenuItem
+            // 
+            this.browseFolderToolStripMenuItem.Image = global::Maestro.Editors.Properties.Resources.folder_horizontal;
+            this.browseFolderToolStripMenuItem.Name = "browseFolderToolStripMenuItem";
+            this.browseFolderToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.browseFolderToolStripMenuItem.Text = "Browse Folder";
+            this.browseFolderToolStripMenuItem.Click += new System.EventHandler(this.browseFolderToolStripMenuItem_Click);
+            // 
             // btnDelete
             // 
             this.btnDelete.Enabled = false;
@@ -71,16 +92,6 @@
             this.btnDelete.Text = "Delete";
             this.btnDelete.Click += new System.EventHandler(this.btnDelete_Click);
             // 
-            // btnRefresh
-            // 
-            this.btnRefresh.Image = global::Maestro.Editors.Properties.Resources.arrow_circle_135;
-            this.btnRefresh.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.btnRefresh.Name = "btnRefresh";
-            this.btnRefresh.Size = new System.Drawing.Size(122, 22);
-            this.btnRefresh.Text = "Refresh Mappings";
-            this.btnRefresh.ToolTipText = "Refresh the mapping data for the selected items";
-            this.btnRefresh.Click += new System.EventHandler(this.btnRefresh_Click);
-            // 
             // lstView
             // 
             this.lstView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@@ -125,6 +136,10 @@
             this.btnRebuild.UseVisualStyleBackColor = true;
             this.btnRebuild.Click += new System.EventHandler(this.btnRebuild_Click);
             // 
+            // openFileDialog
+            // 
+            this.openFileDialog.Multiselect = true;
+            // 
             // CompositeFileCtrl
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -150,7 +165,10 @@
         private System.Windows.Forms.Button btnRebuild;
         private System.Windows.Forms.ToolStripSplitButton btnAdd;
         private System.Windows.Forms.ToolStripButton btnDelete;
-        private System.Windows.Forms.ToolStripButton btnRefresh;
         private System.Windows.Forms.ImageList imgList;
+        private System.Windows.Forms.ToolStripMenuItem browseFilesToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem browseFolderToolStripMenuItem;
+        private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog;
+        private System.Windows.Forms.OpenFileDialog openFileDialog;
     }
 }

Modified: sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.cs
===================================================================
--- sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.cs	2011-03-07 09:24:36 UTC (rev 5602)
+++ sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.cs	2011-03-07 13:47:28 UTC (rev 5603)
@@ -29,6 +29,11 @@
 using System.Xml;
 using OSGeo.MapGuide.MaestroAPI.Schema;
 using System.IO;
+using Maestro.Shared.UI;
+using OSGeo.MapGuide.MaestroAPI.Resource;
+using OSGeo.MapGuide.ObjectModels;
+using OSGeo.MapGuide.MaestroAPI;
+using System.Collections.Specialized;
 
 namespace Maestro.Editors.FeatureSource.Providers.Gdal
 {
@@ -46,7 +51,13 @@
         public override void Bind(IEditorService service)
         {
             _service = service;
+            _service.RegisterCustomNotifier(this);
             _fs = (IFeatureSource)_service.GetEditedResource();
+            InitDefaults();
+        }
+
+        internal void InitDefaults()
+        {
             string xml = _fs.GetConfigurationContent();
             if (!string.IsNullOrEmpty(xml))
             {
@@ -63,95 +74,237 @@
                 List<string> files = new List<string>();
                 foreach (var loc in _conf.RasterLocations)
                 {
-                    foreach (var item in loc.Items)
-                    {
-                        ListViewItem lvi = new ListViewItem();
-                        lvi.Name = Path.Combine(loc.Location, item.FileName);
-                        lvi.Text = lvi.Name;
-                        lvi.Tag = item;
-                        lvi.ImageIndex = 0;
-
-                        lstView.Items.Add(lvi);
-                    }
+                    AddRasterItems(loc.Location, loc.Items);
                 }
             }
         }
 
+        private void AddRasterItems(string dir, GdalRasterItem[] items)
+        {
+            foreach (var item in items)
+            {
+                AddRasterItem(dir, item);
+            }
+        }
+
+        private void AddRasterItem(string dir, GdalRasterItem item)
+        {
+            ListViewItem lvi = new ListViewItem();
+            lvi.Name = Path.Combine(dir, item.FileName);
+            lvi.Text = lvi.Name;
+            lvi.Tag = item;
+            lvi.ImageIndex = 0;
+
+            lstView.Items.Add(lvi);
+        }
+
+        // This should really come from GetSchemaMapping, but it's broken:  minX, minY, maxX, maxY
+        private const string TEMPLATE_CFG = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><fdo:DataStore xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" xmlns:gml=\"http://www.opengis.net/gml\" xmlns:fdo=\"http://fdo.osgeo.org/schemas\" xmlns:fds=\"http://fdo.osgeo.org/schemas/fds\"><gml:DerivedCRS gml:id=\"Default\"><gml:metaDataProperty><gml:GenericMetaData><fdo:SCExtentType>dynamic</fdo:SCExtentType><fdo:XYTolerance>0.001000</fdo:XYTolerance><fdo:ZTolerance>0.001000</fdo:ZTolerance></gml:GenericMetaData></gml:metaDataProperty><gml:remarks>System generated default FDO Spatial Context</gml:remarks><gml:srsName>Default</gml:srsName><gml:validArea><gml:boundingBox><gml:pos>{0} {1}</gml:pos><gml:pos>{2} {3}</gml:pos></gml:boundingBox></gml:validArea><gml:baseCRS>" +
+            "<fdo:WKTCRS gml:id=\"Default\"><gml:srsName>Default</gml:srsName><fdo:WKT>LOCAL_CS[\"*XY-MT*\",LOCAL_DATUM[\"*X-Y*\",10000],UNIT[\"Meter\", 1],AXIS[\"X\",EAST],AXIS[\"Y\",NORTH]]</fdo:WKT></fdo:WKTCRS></gml:baseCRS><gml:definedByConversion xlink:href=\"http://fdo.osgeo.org/coord_conversions#identity\"/><gml:derivedCRSType codeSpace=\"http://fdo.osgeo.org/crs_types\">geographic</gml:derivedCRSType><gml:usesCS xlink:href=\"http://fdo.osgeo.org/cs#default_cartesian\"/></gml:DerivedCRS><xs:schema xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:fdo=\"http://fdo.osgeo.org/schemas\" xmlns:gml=\"http://www.opengis.net/gml\" xmlns:default=\"http://fdo.osgeo.org/schemas/feature/default\" targetNamespace=\"http://fdo.osgeo.org/schemas/feature/default\" elementFormDefault=\"qualified\" attributeFormDefault=\"unqualified\"><xs:annotation><xs:appinfo source=\"http://fdo.osgeo.org/schemas\"/></xs:annotation><xs:element name=\"default\" type=\"default:defaultType\" abstract
 =\"false\" substitutionGroup=\"gml:_Feature\"><xs:key name=\"defaultKey\"><xs:selector xpath=\".//default\"/>" +
+            "<xs:field xpath=\"FeatId\"/></xs:key></xs:element><xs:complexType name=\"defaultType\" abstract=\"false\" fdo:hasGeometry=\"false\"><xs:annotation><xs:appinfo source=\"http://fdo.osgeo.org/schemas\"/></xs:annotation><xs:complexContent><xs:extension base=\"gml:AbstractFeatureType\"><xs:sequence><xs:element name=\"FeatId\"><xs:annotation><xs:appinfo source=\"http://fdo.osgeo.org/schemas\"/></xs:annotation><xs:simpleType><xs:restriction base=\"xs:string\"><xs:maxLength value=\"256\"/></xs:restriction></xs:simpleType></xs:element><xs:element name=\"Image\" type=\"fdo:RasterPropertyType\" fdo:defaultImageXSize=\"1024\" fdo:defaultImageYSize=\"1024\" fdo:srsName=\"Default\"><xs:annotation>" +
+            "<xs:appinfo source=\"http://fdo.osgeo.org/schemas\"><fdo:DefaultDataModel dataModelType=\"Bitonal\" dataType=\"Unknown\" organization=\"Pixel\" bitsPerPixel=\"1\" tileSizeX=\"256\" tileSizeY=\"256\"/></xs:appinfo></xs:annotation></xs:element></xs:sequence></xs:extension></xs:complexContent></xs:complexType></xs:schema><SchemaMapping xmlns=\"http://fdogrfp.osgeo.org/schemas\" provider=\"OSGeo.Gdal.3.2\" name=\"default\"></SchemaMapping></fdo:DataStore>";
+
+
         private void BuildDefaultDocument()
         {
-            _conf = new GdalConfigurationDocument();
-            var xmlDoc = new XmlDocument();
-            XmlNamespaceManager mgr = new XmlNamespaceManager(xmlDoc.NameTable);
-            mgr.AddNamespace("xs", XmlNamespaces.XS);
-            mgr.AddNamespace("xsi", XmlNamespaces.XSI);
-            mgr.AddNamespace("fdo", XmlNamespaces.FDO);
-            mgr.AddNamespace("gml", XmlNamespaces.GML);
-            mgr.AddNamespace("xlink", XmlNamespaces.XLINK);
-            mgr.AddNamespace("fds", XmlNamespaces.FDS);
+            _conf = (GdalConfigurationDocument)ConfigurationDocument.LoadXml(string.Format(TEMPLATE_CFG, -10000000, -10000000, 10000000, 10000000));
+        }
 
-            var desc = _fs.Describe();
-            _conf.AddSchema(desc.Schemas[0]); //Only one schema is supported by Gdal so this is ok
+        private void btnDelete_Click(object sender, EventArgs e)
+        {
+            List<string> files = new List<string>();
+            List<ListViewItem> items = new List<ListViewItem>();
+            foreach (ListViewItem item in lstView.SelectedItems)
+            {
+                items.Add(item);
+                files.Add(item.Text);
+            }
+            DoUpdateConfiguration(new string[0], files.ToArray());
+            foreach (var it in items)
+            {
+                lstView.Items.Remove(it);
+            }
+        }
 
-            var scList = _fs.GetSpatialInfo(false);
-            foreach (var sc in scList.SpatialContext)
+        private void lstView_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            //btnRefresh.Enabled = 
+            btnDelete.Enabled = (lstView.SelectedItems.Count > 0);
+        }
+
+        private void btnRebuild_Click(object sender, EventArgs e)
+        {
+            BuildDefaultDocument();
+            List<string> files = new List<string>();
+            foreach (ListViewItem item in lstView.Items)
             {
-                _conf.AddSpatialContext(sc);
+                files.Add(item.Text);
             }
+            DoUpdateConfiguration(files.ToArray(), new string[0]);
         }
 
-        private void btnDelete_Click(object sender, EventArgs e)
+        private void browseFilesToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            foreach (ListViewItem item in lstView.SelectedItems)
+            if (openFileDialog.ShowDialog() == DialogResult.OK)
             {
-                string dir = Path.GetDirectoryName(item.Text);
+                DoUpdateConfiguration(openFileDialog.FileNames, new string[0]);
+            }
+        }
 
-                GdalRasterLocationItem loc = null;
-                foreach (var locItem in _conf.RasterLocations)
+        private void DoUpdateConfiguration(string[] toAdd, string[] toRemove)
+        {
+            if (_conf == null)
+                BuildDefaultDocument();
+
+            var pdlg = new ProgressDialog();
+            pdlg.CancelAbortsThread = true;
+            var worker = new ProgressDialog.DoBackgroundWork(UpdateConfigurationDocument);
+            var result = (UpdateConfigResult)pdlg.RunOperationAsync(null, worker, _conf, _fs.CurrentConnection, toAdd, toRemove);
+            if (result.Added.Count > 0 || result.Removed.Count > 0)
+            {
+                _fs.SetConfigurationContent(_conf.ToXml());
+                List<ListViewItem> remove = new List<ListViewItem>();
+                foreach (ListViewItem lvi in lstView.Items)
                 {
-                    if (locItem.Location == dir)
-                    {
-                        loc = locItem;
-                        break;
-                    }
+                    if (result.Removed.Contains(lvi.Text))
+                        remove.Add(lvi);
                 }
-
-                //Remove raster item
-                if (loc != null)
+                foreach (var added in result.Added)
                 {
-                    loc.RemoveItem((GdalRasterItem)item.Tag);
+                    var dir = Path.GetDirectoryName(added);
+                    var fileName = Path.GetFileName(added);
 
-                    //Remove if empty
-                    if (loc.Items.Length == 0)
+                    foreach (var loc in _conf.RasterLocations)
                     {
-                        _conf.RemoveLocation(loc);
+                        if (loc.Location == dir)
+                        {
+                            foreach (var item in loc.Items)
+                            {
+                                if (item.FileName == fileName)
+                                {
+                                    AddRasterItem(dir, item);
+                                }
+                            }
+                        }
                     }
                 }
+                OnResourceChanged();
             }
-            _fs.SetConfigurationContent(_conf.ToXml());
-            OnResourceChanged();
         }
 
-        private void btnRefresh_Click(object sender, EventArgs e)
+        class UpdateConfigResult
         {
+            public List<string> Added { get; set; }
 
+            public List<string> Removed { get; set; }
         }
 
-        private void lstView_SelectedIndexChanged(object sender, EventArgs e)
+        object UpdateConfigurationDocument(BackgroundWorker worker, DoWorkEventArgs e, params object[] args)
         {
-            btnRefresh.Enabled = btnDelete.Enabled = (lstView.SelectedItems.Count > 0);
+            GdalConfigurationDocument conf = (GdalConfigurationDocument)args[0];
+         
+            IServerConnection conn = (IServerConnection)args[1];
+            string [] toAdd = args[2] as string[];
+            string [] toRemove = args[3] as string[];
+
+            worker.ReportProgress(0, Properties.Resources.UpdatingConfiguration);
+
+            int total = toAdd.Length + toRemove.Length;
+            int unit = (total / 100);
+            int progress = 0;
+
+            var result = new UpdateConfigResult() { Added = new List<string>(), Removed = new List<string>() };
+
+            foreach (var add in toAdd)
+            {
+                var dir = Path.GetDirectoryName(add);
+                var loc = conf.AddLocation(dir);
+
+                //Create a temp feature source to attempt interrogation of extents
+                var values = new NameValueCollection();
+                values["DefaultRasterFileLocation"] = add;
+                var fs = ObjectFactory.CreateFeatureSource(conn, "OSGeo.Gdal", values);
+
+                var resId = new ResourceIdentifier("Session:" + conn.SessionID + "//" + Guid.NewGuid() + ".FeatureSource");
+                fs.ResourceID = resId.ToString();
+                conn.ResourceService.SaveResource(fs);
+
+                var scList = fs.GetSpatialInfo(false);
+                
+                var raster = new GdalRasterItem()
+                {
+                    FileName = Path.GetFileName(add)
+                };
+
+                if (scList.SpatialContext.Count > 0)
+                {
+                    raster.MinX = Convert.ToDouble(scList.SpatialContext[0].Extent.LowerLeftCoordinate.X);
+                    raster.MinY = Convert.ToDouble(scList.SpatialContext[0].Extent.LowerLeftCoordinate.Y);
+                    raster.MaxX = Convert.ToDouble(scList.SpatialContext[0].Extent.UpperRightCoordinate.X);
+                    raster.MaxY = Convert.ToDouble(scList.SpatialContext[0].Extent.UpperRightCoordinate.Y);
+                }
+                else
+                {
+                    raster.MinX = -10000000;
+                    raster.MinY = -10000000;
+                    raster.MaxX = 10000000;
+                    raster.MaxY = 10000000;
+                }
+
+                loc.AddItem(raster);
+
+                result.Added.Add(Path.Combine(dir, raster.FileName));
+
+                progress += unit;
+                worker.ReportProgress(progress, string.Format(Properties.Resources.ProcessedItem, add));
+            }
+
+            foreach (var remove in toRemove)
+            {
+                var dir = Path.GetDirectoryName(remove);
+                var loc = FindLocation(conf, dir);
+                if (null != loc)
+                {
+                    loc.RemoveItem(Path.GetFileName(remove));
+                    result.Removed.Add(remove);
+                    if (loc.Items.Length == 0)
+                        conf.RemoveLocation(loc);
+                }
+                progress += unit;
+                worker.ReportProgress(progress, string.Format(Properties.Resources.ProcessedItem, remove));
+            }
+
+            return result;
         }
 
-        private void btnRebuild_Click(object sender, EventArgs e)
+        private static GdalRasterLocationItem FindLocation(GdalConfigurationDocument conf, string directory)
         {
-            BuildDefaultDocument();
-            foreach (ListViewItem item in lstView.Items)
+            foreach (var loc in conf.RasterLocations)
             {
-                string dir = Path.GetDirectoryName(item.Text);
-                var loc = _conf.AddLocation(dir);
-                GdalRasterItem raster = (GdalRasterItem)item.Tag;
-                loc.AddItem(raster);
+                if (loc.Location == directory)
+                    return loc;
             }
-            OnResourceChanged();
+            return null;
         }
+
+        private void browseFolderToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (folderBrowserDialog.ShowDialog() == DialogResult.OK)
+            {
+                List<string> files = new List<string>();
+                files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.png"));
+                files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.jpg"));
+                files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.jpeg"));
+                files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.tif"));
+                files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.tiff"));
+                files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.ecw"));
+                files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.sid"));
+                files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.dem"));
+                files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.gif"));
+                files.AddRange(Directory.GetFiles(folderBrowserDialog.SelectedPath, "*.bmp"));
+
+                DoUpdateConfiguration(files.ToArray(), new string[0]);
+            }
+        }
     }
 }

Modified: sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.resx
===================================================================
--- sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.resx	2011-03-07 09:24:36 UTC (rev 5602)
+++ sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Gdal/CompositeFileCtrl.resx	2011-03-07 13:47:28 UTC (rev 5603)
@@ -128,7 +128,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADQ
-        BwAAAk1TRnQBSQFMAwEBAAEYAQABGAEAARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
+        BwAAAk1TRnQBSQFMAwEBAAFAAQABQAEAARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA
         AUADAAEQAwABAQEAAQgGAAEEGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA
         AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA
         AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm
@@ -164,4 +164,10 @@
         AQEFAAGAFwAD/wEAAv9uAAL/BgAC/wYACw==
 </value>
   </data>
+  <metadata name="folderBrowserDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>213, 17</value>
+  </metadata>
+  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>382, 17</value>
+  </metadata>
 </root>
\ No newline at end of file

Modified: sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Gdal/GdalProviderCtrl.cs
===================================================================
--- sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Gdal/GdalProviderCtrl.cs	2011-03-07 09:24:36 UTC (rev 5602)
+++ sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Gdal/GdalProviderCtrl.cs	2011-03-07 13:47:28 UTC (rev 5603)
@@ -46,16 +46,26 @@
         private CompositeFileCtrl _comp;
         private SingleFileCtrl _sing;
 
+        private bool _init = false;
+
         public override void Bind(IEditorService service)
         {
-            _service = service;
-            _fs = (IFeatureSource)_service.GetEditedResource();
-            _sing.Bind(service);
-            _comp.Bind(service);
-            if (!string.IsNullOrEmpty(_fs.GetConfigurationContent()))
-                rdComposite.Checked = true;
-            else
-                rdSingle.Checked = true;
+            try
+            {
+                _init = true;
+                _service = service;
+                _fs = (IFeatureSource)_service.GetEditedResource();
+                _sing.Bind(service);
+                _comp.Bind(service);
+                if (!string.IsNullOrEmpty(_fs.GetConfigurationContent()))
+                    rdComposite.Checked = true;
+                else
+                    OnTypeCheckedChanged(null, null); //It is already checked by default
+            }
+            finally
+            {
+                _init = false;
+            }
         }
 
         private void OnTypeCheckedChanged(object sender, EventArgs e)
@@ -64,11 +74,21 @@
             {
                 panel1.Controls.Clear();
                 panel1.Controls.Add(_sing);
+
+                //_sing.InitDefaults();
+
+                //if (!_init) //When switching modes, invalidate configuraton document as it is no longer valid
+                //    _fs.SetConfigurationContent(null);
             }
             else if (rdComposite.Checked)
             {
                 panel1.Controls.Clear();
                 panel1.Controls.Add(_comp);
+
+                //_comp.InitDefaults();
+
+                //if (!_init) //When switching modes, invalidate configuraton document as it is no longer valid
+                //    _fs.SetConfigurationContent(null);
             }
         }
 

Modified: sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Gdal/SingleFileCtrl.Designer.cs
===================================================================
--- sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Gdal/SingleFileCtrl.Designer.cs	2011-03-07 09:24:36 UTC (rev 5602)
+++ sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Gdal/SingleFileCtrl.Designer.cs	2011-03-07 13:47:28 UTC (rev 5603)
@@ -37,6 +37,8 @@
             this.btnBrowseAliasFile = new System.Windows.Forms.Button();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
+            this.folderBrowserDialog = new System.Windows.Forms.FolderBrowserDialog();
             this.groupBox1.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.SuspendLayout();
@@ -80,6 +82,7 @@
             this.btnBrowseFile.TabIndex = 5;
             this.btnBrowseFile.Text = "...";
             this.btnBrowseFile.UseVisualStyleBackColor = true;
+            this.btnBrowseFile.Click += new System.EventHandler(this.btnBrowseFile_Click);
             // 
             // btnBrowseDir
             // 
@@ -89,6 +92,7 @@
             this.btnBrowseDir.Size = new System.Drawing.Size(27, 23);
             this.btnBrowseDir.TabIndex = 6;
             this.btnBrowseDir.UseVisualStyleBackColor = true;
+            this.btnBrowseDir.Click += new System.EventHandler(this.btnBrowseDir_Click);
             // 
             // btnBrowseAliasDir
             // 
@@ -98,6 +102,7 @@
             this.btnBrowseAliasDir.Size = new System.Drawing.Size(27, 23);
             this.btnBrowseAliasDir.TabIndex = 8;
             this.btnBrowseAliasDir.UseVisualStyleBackColor = true;
+            this.btnBrowseAliasDir.Click += new System.EventHandler(this.btnBrowseAliasDir_Click);
             // 
             // btnBrowseAliasFile
             // 
@@ -107,6 +112,7 @@
             this.btnBrowseAliasFile.TabIndex = 7;
             this.btnBrowseAliasFile.Text = "...";
             this.btnBrowseAliasFile.UseVisualStyleBackColor = true;
+            this.btnBrowseAliasFile.Click += new System.EventHandler(this.btnBrowseAliasFile_Click);
             // 
             // groupBox1
             // 
@@ -161,5 +167,7 @@
         private System.Windows.Forms.Button btnBrowseAliasFile;
         private System.Windows.Forms.GroupBox groupBox1;
         private System.Windows.Forms.GroupBox groupBox2;
+        private System.Windows.Forms.OpenFileDialog openFileDialog;
+        private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog;
     }
 }

Modified: sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Gdal/SingleFileCtrl.cs
===================================================================
--- sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Gdal/SingleFileCtrl.cs	2011-03-07 09:24:36 UTC (rev 5602)
+++ sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Gdal/SingleFileCtrl.cs	2011-03-07 13:47:28 UTC (rev 5603)
@@ -25,6 +25,8 @@
 using System.Text;
 using System.Windows.Forms;
 using OSGeo.MapGuide.ObjectModels.FeatureSource;
+using Maestro.Editors.Generic;
+using Maestro.Editors.Common;
 
 namespace Maestro.Editors.FeatureSource.Providers.Gdal
 {
@@ -37,15 +39,75 @@
 
         private IFeatureSource _fs;
 
+        private bool _init = false;
+
         public override void Bind(IEditorService service)
         {
-            service.RegisterCustomNotifier(this);
-            _fs = (IFeatureSource)service.GetEditedResource();
+            try
+            {
+                _init = true;
+                service.RegisterCustomNotifier(this);
+                _fs = (IFeatureSource)service.GetEditedResource();
+
+                InitDefaults();
+            }
+            finally
+            {
+                _init = false;
+            }
         }
 
+        internal void InitDefaults()
+        {
+            txtPath.Text = _fs.GetConnectionProperty("DefaultRasterFileLocation");
+        }
+
         private void txtPath_TextChanged(object sender, EventArgs e)
         {
+            if (_init)
+                return;
+
             _fs.SetConnectionProperty("DefaultRasterFileLocation", txtPath.Text);
         }
+
+        private void btnBrowseFile_Click(object sender, EventArgs e)
+        {
+            if (openFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                txtPath.Text = openFileDialog.FileName;
+            }
+        }
+
+        private void btnBrowseDir_Click(object sender, EventArgs e)
+        {
+            if (folderBrowserDialog.ShowDialog() == DialogResult.OK)
+            {
+                txtPath.Text = folderBrowserDialog.SelectedPath;
+            }
+        }
+
+        private void btnBrowseAliasFile_Click(object sender, EventArgs e)
+        {
+            using (var picker = new UnmanagedFileBrowser(_fs.CurrentConnection.ResourceService))
+            {
+                picker.SelectFoldersOnly = false;
+                if (picker.ShowDialog() == DialogResult.OK)
+                {
+                    txtPath.Text = picker.SelectedItem;
+                }
+            }
+        }
+
+        private void btnBrowseAliasDir_Click(object sender, EventArgs e)
+        {
+            using (var picker = new UnmanagedFileBrowser(_fs.CurrentConnection.ResourceService))
+            {
+                picker.SelectFoldersOnly = true;
+                if (picker.ShowDialog() == DialogResult.OK)
+                {
+                    txtPath.Text = picker.SelectedItem;
+                }
+            }
+        }
     }
 }

Modified: sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Gdal/SingleFileCtrl.resx
===================================================================
--- sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Gdal/SingleFileCtrl.resx	2011-03-07 09:24:36 UTC (rev 5602)
+++ sandbox/maestro-3.0/Maestro.Editors/FeatureSource/Providers/Gdal/SingleFileCtrl.resx	2011-03-07 13:47:28 UTC (rev 5603)
@@ -117,4 +117,10 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="folderBrowserDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>157, 17</value>
+  </metadata>
 </root>
\ No newline at end of file

Modified: sandbox/maestro-3.0/Maestro.Editors/Maestro.Editors.csproj
===================================================================
--- sandbox/maestro-3.0/Maestro.Editors/Maestro.Editors.csproj	2011-03-07 09:24:36 UTC (rev 5602)
+++ sandbox/maestro-3.0/Maestro.Editors/Maestro.Editors.csproj	2011-03-07 13:47:28 UTC (rev 5603)
@@ -1847,6 +1847,7 @@
     <Content Include="OdbcDriverMap.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <None Include="Resources\document.png" />
     <None Include="Resources\ui-separator.png" />
     <None Include="Resources\gear--plus.png" />
     <None Include="Resources\gear--pencil.png" />

Modified: sandbox/maestro-3.0/Maestro.Editors/Properties/Resources.Designer.cs
===================================================================
--- sandbox/maestro-3.0/Maestro.Editors/Properties/Resources.Designer.cs	2011-03-07 09:24:36 UTC (rev 5602)
+++ sandbox/maestro-3.0/Maestro.Editors/Properties/Resources.Designer.cs	2011-03-07 13:47:28 UTC (rev 5603)
@@ -466,6 +466,13 @@
             }
         }
         
+        internal static System.Drawing.Bitmap document {
+            get {
+                object obj = ResourceManager.GetObject("document", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         internal static System.Drawing.Bitmap document__minus {
             get {
                 object obj = ResourceManager.GetObject("document--minus", resourceCulture);
@@ -2043,6 +2050,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Processed: {0}.
+        /// </summary>
+        internal static string ProcessedItem {
+            get {
+                return ResourceManager.GetString("ProcessedItem", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to This command is referenced in the following menus: {0}. Do you want to delete this command and all menu items referencing it?.
         /// </summary>
         internal static string PromptDeleteCommand {
@@ -2549,6 +2565,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Updating Configuration Document.
+        /// </summary>
+        internal static string UpdatingConfiguration {
+            get {
+                return ResourceManager.GetString("UpdatingConfiguration", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to An error occured while validating the output file path: {0}.
         /// </summary>
         internal static string ValidateOutputfileError {

Modified: sandbox/maestro-3.0/Maestro.Editors/Properties/Resources.resx
===================================================================
--- sandbox/maestro-3.0/Maestro.Editors/Properties/Resources.resx	2011-03-07 09:24:36 UTC (rev 5602)
+++ sandbox/maestro-3.0/Maestro.Editors/Properties/Resources.resx	2011-03-07 13:47:28 UTC (rev 5603)
@@ -125,6 +125,12 @@
     <value>Failed to read {0} color(s) in line {1}</value>
     <comment>An error message that is displayed if the expected color count does not match the actual count</comment>
   </data>
+  <data name="Confirm" xml:space="preserve">
+    <value>Confirm</value>
+  </data>
+  <data name="gear--pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\gear--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="minus-circle" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\minus-circle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -137,6 +143,9 @@
   <data name="application--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\application--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="property" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\property.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="DataReadError" xml:space="preserve">
     <value>Unable to read data from the selected column: {0}</value>
     <comment>An error message that is displayed when the column read fails</comment>
@@ -166,27 +175,24 @@
   <data name="icon_refreshmap_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_refreshmap_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="folder_horizontal" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\folder-horizontal.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="block" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\block.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="InvokeScriptCmdDescription" xml:space="preserve">
+    <value>Invoke Script Command</value>
+  </data>
   <data name="InvalidResourceIdFolder" xml:space="preserve">
     <value>Must be valid resource id. Cannot be a folder</value>
   </data>
-  <data name="icon_tasks" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_tasks.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="SelectProperty" xml:space="preserve">
+    <value>Select Property</value>
   </data>
   <data name="ColHeaderName" xml:space="preserve">
     <value>Name</value>
   </data>
-  <data name="ui_splitter_horizontal" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ui-splitter-horizontal.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="SelectSpatialContext" xml:space="preserve">
+    <value>Select Spatial Context</value>
   </data>
-  <data name="SaveResourceFirst" xml:space="preserve">
-    <value>Please save this resource first</value>
-  </data>
   <data name="layer" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\layer.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -196,9 +202,16 @@
   <data name="control" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\control.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="icon_selectradius_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_selectradius_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="icon_zoomout_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_zoomout_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="PackageReadError" xml:space="preserve">
+    <value>Failed to read package. Error message was: {0}</value>
+    <comment>A message displayed when the package could not be read</comment>
+  </data>
   <data name="sql-join-left" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sql-join-left.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -225,6 +238,9 @@
   <data name="cross-circle-frame" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\cross-circle-frame.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="InvokeUrlNoMapDefined" xml:space="preserve">
+    <value>Cannot get layers. No map definition specified</value>
+  </data>
   <data name="server" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\server.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -250,11 +266,11 @@
   <data name="document--pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\document--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="tick" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\tick.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="layers-stack-arrange" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\layers-stack-arrange.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="gear--minus" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\gear--minus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icon_selectwithin_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_selectwithin_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="gear" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\gear.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -283,12 +299,12 @@
   <data name="SpecifySecondaryFeatureSource" xml:space="preserve">
     <value>Please specify the secondary feature source</value>
   </data>
-  <data name="globe--arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\globe--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="drive-download" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\drive-download.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="icon_search" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_search.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="QualitativeName" xml:space="preserve">
     <value>Qualitative</value>
     <comment>A display name for the Qualitative data type</comment>
@@ -299,11 +315,12 @@
   <data name="sort-number" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sort-number.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon_selectwithin" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_selectwithin.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="SelectWidget" xml:space="preserve">
+    <value>Select widget</value>
   </data>
-  <data name="DeleteCommand" xml:space="preserve">
-    <value>Delete Command</value>
+  <data name="InvalidValueError" xml:space="preserve">
+    <value>Invalid value</value>
+    <comment>An error message that is displayed when the entered value is invalid</comment>
   </data>
   <data name="sql-join-right" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sql-join-right.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -355,6 +372,12 @@
   <data name="icon_fitwindow" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_fitwindow.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="ui-separator" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ui-separator.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="CustomCommandsExported" xml:space="preserve">
+    <value>Custom commands exported to {0}</value>
+  </data>
   <data name="UnitsKb" xml:space="preserve">
     <value>KB</value>
   </data>
@@ -364,6 +387,9 @@
   <data name="icon_panright_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_panright_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="NoSchemasInFeatureSource" xml:space="preserve">
+    <value>Feature Source has no schemas</value>
+  </data>
   <data name="RdbmsFeatureSource" xml:space="preserve">
     <value>RDBMS Feature Source</value>
   </data>
@@ -374,21 +400,25 @@
   <data name="TestConnectionNoErrors" xml:space="preserve">
     <value>Provider reported no errors</value>
   </data>
-  <data name="globe--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\globe--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icon_zoomrect" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_zoomrect.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="icon_selectpolygon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_selectpolygon.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="StandardQuery" xml:space="preserve">
-    <value>Standard Query</value>
+  <data name="FileDownloaded" xml:space="preserve">
+    <value>File Downloaded to {0}</value>
   </data>
-  <data name="OverwriteDisplayScales" xml:space="preserve">
-    <value>Overwrite the current display scales?</value>
-  </data>
   <data name="map--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\map--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="InvalidColorComponent" xml:space="preserve">
+    <value>Invalid {0} color component {1} in line {2}</value>
+    <comment>An error message that is displayed if a color component is outside the [0-255] range.
+{0} is the color component, eg. R, G or B
+{1} is the value read
+{2} is the line where the error was encountered</comment>
+  </data>
   <data name="NoTypesSelected" xml:space="preserve">
     <value>You must select at least one type</value>
     <comment>A message that is displayed when the user has not selected any resource types</comment>
@@ -399,13 +429,25 @@
   <data name="gear--arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\gear--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="OdbcDriverExcel64" xml:space="preserve">
+    <value>{Microsoft Excel Driver (*.xls, *.xlsx, *.xlsm, *.xlsb)}</value>
+  </data>
   <data name="layer--minus" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\layer--minus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Infinity" xml:space="preserve">
+    <value>Infinity</value>
+  </data>
+  <data name="globe--pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\globe--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="UnknownResourceTypes" xml:space="preserve">
     <value>Unknown types</value>
     <comment>The list entry that represents unknown resource types</comment>
   </data>
+  <data name="IncompatibleConnection" xml:space="preserve">
+    <value>This connection is not compatible</value>
+  </data>
   <data name="icon_panright" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_panright.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -453,6 +495,9 @@
   <data name="drive-upload" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\drive-upload.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="document--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\document--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="application-import" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\application-import.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -465,26 +510,25 @@
   <data name="globe--minus" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\globe--minus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="FindNothing" xml:space="preserve">
-    <value>Could not find specified string or end of document reached</value>
+  <data name="FdoConnectionStringComponentNotFound" xml:space="preserve">
+    <value>The component "{0}" could not be found in the specified FDO connection string</value>
   </data>
   <data name="OutputFileMissing" xml:space="preserve">
     <value>You must enter a full path to the output file</value>
     <comment>A message that is displayed when the user has not entered an output file</comment>
   </data>
-  <data name="FontPreviewError" xml:space="preserve">
-    <value>Cannot Preview Font "{0}"</value>
-    <comment>An error message that is displayed when the rendering fails, using the specified font</comment>
-  </data>
   <data name="ExpressionItem" xml:space="preserve">
     <value>Expression...</value>
     <comment>A value displayed in the combobox to activate the expression builder</comment>
   </data>
+  <data name="OdbcConnectionStringComponentNotFound" xml:space="preserve">
+    <value>The component "{0}" could not be found in the specified ODBC connection string</value>
+  </data>
   <data name="UnitsMs" xml:space="preserve">
     <value>ms</value>
   </data>
-  <data name="icon_forward" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_forward.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icon_print" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_print.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="databases-relation" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\databases-relation.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -493,6 +537,9 @@
     <value>An error occured while validating the output file path: {0}</value>
     <comment>A message that is displayed to the user when the output path is invalid</comment>
   </data>
+  <data name="ExportNoCustomCommandsSelected" xml:space="preserve">
+    <value>No custom commands selected. Nothing to export</value>
+  </data>
   <data name="arrow-return-180" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\arrow-return-180.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -516,9 +563,6 @@
   <data name="icon_copy_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_copy_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="FileDownloaded" xml:space="preserve">
-    <value>File Downloaded to {0}</value>
-  </data>
   <data name="ColumnHasNoValidDataError" xml:space="preserve">
     <value>The selected column had no non-null values and cannot be used.</value>
     <comment>An error message that is displayed if the user selects a column with no valid data</comment>
@@ -526,6 +570,12 @@
   <data name="SaveResource" xml:space="preserve">
     <value>Save Resource</value>
   </data>
+  <data name="OdbcCannotInferDriver" xml:space="preserve">
+    <value>Could not infer ODBC driver from file name: {0}</value>
+  </data>
+  <data name="icon_measure" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_measure.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="PropertyTooltip" xml:space="preserve">
     <value>Property: {0}
 Type: {1}</value>
@@ -551,6 +601,10 @@
     <value>MapGuide Packages ({0})</value>
     <comment>The text displayed when browsing for MGP files</comment>
   </data>
+  <data name="TooManyIndiviualValuesError" xml:space="preserve">
+    <value>The selected column contains more than {0} different values, and thus cannot be used for theming with individual values</value>
+    <comment>An error message that is displayed if the selected column has too many distinct values</comment>
+  </data>
   <data name="RepositoryWipeWarning" xml:space="preserve">
     <value>You have selected to restore the package at the root.
 You have also selected to delete the target before restoring.
@@ -558,6 +612,9 @@
 Are you absolutely sure that is what you want?</value>
     <comment>A confirmation message displayed to the user, when creating a package that will completely wipe a repository</comment>
   </data>
+  <data name="Separator" xml:space="preserve">
+    <value>Separator</value>
+  </data>
   <data name="icon_panup_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_panup_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -567,19 +624,14 @@
   <data name="folder--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\folder--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="arrow-curve" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\arrow-curve.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="folder--minus" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\folder--minus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="FindReplaceNothing" xml:space="preserve">
     <value>Nothing to replace</value>
   </data>
-  <data name="TooMuchDataWarning" xml:space="preserve">
-    <value>The selected column contains more than {0} different values.
-The calculated averages only accounts for the first {0} distinct values.</value>
-    <comment>A warning message that is displayed if the dataset is too large</comment>
+  <data name="gear--minus" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\gear--minus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="control-stop-square" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\control-stop-square.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -620,13 +672,19 @@
   <data name="cross-script" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\cross-script.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="LoadProcedureVersionExecutionNotSupported" xml:space="preserve">
-    <value>This connection does not support executing this type of Load Procedure</value>
+  <data name="icon_zoomin_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_zoomin_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="ExportNoCommandsSelected" xml:space="preserve">
+    <value>No commands selected. Nothing to export</value>
+  </data>
   <data name="SymbolTypeNotSupported" xml:space="preserve">
     <value>Only symbols of type "Mark" and "Font" are currently supported</value>
     <comment>A message that is displayed when the user attempts to modify an item with an unsupported type</comment>
   </data>
+  <data name="FdoConnectionStatus" xml:space="preserve">
+    <value>FDO Connection Status: {0}</value>
+  </data>
   <data name="clipboard-paste" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\clipboard-paste.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -637,6 +695,9 @@
   <data name="UnknownQueryMode" xml:space="preserve">
     <value>Unknown query mode</value>
   </data>
+  <data name="OverwriteDisplayScales" xml:space="preserve">
+    <value>Overwrite the current display scales?</value>
+  </data>
   <data name="PackageBuildError" xml:space="preserve">
     <value>An error occured while building package: {0}</value>
     <comment>A message displayed when the package creation fails</comment>
@@ -648,6 +709,9 @@
   <data name="script--arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\script--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="CheckGeometryFirst" xml:space="preserve">
+    <value>Ensure the Geometry box is checked</value>
+  </data>
   <data name="sql-join" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sql-join.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -661,8 +725,8 @@
   <data name="NoActiveDataFile" xml:space="preserve">
     <value>No active resource data file selected</value>
   </data>
-  <data name="icon_zoomnext" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_zoomnext.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="SelectFeatureClass" xml:space="preserve">
+    <value>Select Feature Class</value>
   </data>
   <data name="icon_zoomprev_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_zoomprev_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -677,11 +741,11 @@
     <value>You must enter a alternate name, or remove the checkmark</value>
     <comment>A message displayed when the user has not entered an alternate name for a resource</comment>
   </data>
-  <data name="globe--pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\globe--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="globe--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\globe--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon_selectwithin_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_selectwithin_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="DeleteCommand" xml:space="preserve">
+    <value>Delete Command</value>
   </data>
   <data name="icon_selectradius" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_selectradius.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -689,8 +753,8 @@
   <data name="application-export" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\application-export.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon_select_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_select_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="GeometryStyleComboDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\GeometryStyleComboDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
   <data name="TitleError" xml:space="preserve">
     <value>Error</value>
@@ -701,14 +765,14 @@
   <data name="icon_plotdwf_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_plotdwf_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="FilterAll" xml:space="preserve">
-    <value>All File Types (*.*)|*.*</value>
+  <data name="icon_copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_copy.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Confirm" xml:space="preserve">
-    <value>Confirm</value>
+  <data name="ui_splitter_horizontal" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ui-splitter-horizontal.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="gear--pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\gear--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="folder_horizontal" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\folder-horizontal.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="icon_ctxarrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_ctxarrow.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -726,8 +790,8 @@
   <data name="question" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\question.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon_zoomrect" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_zoomrect.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="FindNothing" xml:space="preserve">
+    <value>Could not find specified string or end of document reached</value>
   </data>
   <data name="icon_panup" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_panup.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -738,13 +802,19 @@
   <data name="icon_print_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_print_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="FilterXml" xml:space="preserve">
+    <value>XML Files (.xml)|*.xml</value>
+  </data>
   <data name="HeaderFileMissing" xml:space="preserve">
     <value>The header file does not exist</value>
     <comment>A message displayed when the user selects a non-existing file</comment>
   </data>
-  <data name="icon_search" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_search.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icon_select_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_select_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="ConfirmDeleteResourceData" xml:space="preserve">
+    <value>Are you sure you want to delete this resource data?</value>
+  </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="MgCooker" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -767,9 +837,6 @@
     <value>Select the package file to edit</value>
     <comment>The title of the dialog that the is used to pick the package file to edit</comment>
   </data>
-  <data name="icon_zoomprev" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_zoomprev.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="icon_fitwindow_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_fitwindow_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -777,8 +844,8 @@
     <value>Invalid column name</value>
     <comment>An error message that is displayed when the column selected does not exist</comment>
   </data>
-  <data name="icon_print" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_print.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="SaveResourceFirst" xml:space="preserve">
+    <value>Please save this resource first</value>
   </data>
   <data name="FilterShp" xml:space="preserve">
     <value>ESRI Shape File (*.shp)|*.*</value>
@@ -793,6 +860,9 @@
   <data name="FilterSdf" xml:space="preserve">
     <value>Autodesk SDF (*.sdf)|*.*</value>
   </data>
+  <data name="icon_zoom" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_zoom.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="SelectFolder" xml:space="preserve">
     <value>Select Folder</value>
   </data>
@@ -802,12 +872,21 @@
   <data name="FsPostgreSql" xml:space="preserve">
     <value>PostgreSQL/PostGIS Feature Source</value>
   </data>
+  <data name="OdbcDriverExcel" xml:space="preserve">
+    <value>{Microsoft Excel Driver (*.xls)}</value>
+  </data>
+  <data name="AddWidgetReference" xml:space="preserve">
+    <value>Add Widget Reference</value>
+  </data>
   <data name="NewLayer" xml:space="preserve">
     <value>New Layer</value>
   </data>
   <data name="arrow-circle-135" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\arrow-circle-135.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="CustomCommandsImported" xml:space="preserve">
+    <value>{0} custom commands imported from {1}. The following commands had to be renamed to prevent clashes: {2}</value>
+  </data>
   <data name="icon_zoom_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_zoom_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -834,9 +913,6 @@
   <data name="icon_buffer" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_buffer.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="arrow-090" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\arrow-090.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="AllResourceTypes" xml:space="preserve">
     <value>All types</value>
     <comment>The list entry that represents all resource types</comment>
@@ -847,9 +923,12 @@
   <data name="NoSiteService" xml:space="preserve">
     <value>No site service available</value>
   </data>
-  <data name="layers-stack-arrange" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\layers-stack-arrange.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="OdbcDriverAccess64" xml:space="preserve">
+    <value>{Microsoft Access Driver (*.mdb, *.accdb)}</value>
   </data>
+  <data name="icon_forward" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_forward.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="InvokeUrlCmdDescription" xml:space="preserve">
     <value>Invoke URL command</value>
   </data>
@@ -859,9 +938,8 @@
   <data name="PropEnumNoValues" xml:space="preserve">
     <value>Could not find possible values for enumerable property</value>
   </data>
-  <data name="SelectColumnPlaceholder" xml:space="preserve">
-    <value>&lt;Select column&gt;</value>
-    <comment>A placeholder message displayed when the user has not yet selected a column</comment>
+  <data name="SelectLayerFirst" xml:space="preserve">
+    <value>Please select the layer first</value>
   </data>
   <data name="ModeNotAllowed" xml:space="preserve">
     <value>Mode not allowed: {0}</value>
@@ -891,12 +969,18 @@
   <data name="function" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\function.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon_zoom" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_zoom.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="OdbcNoMarkedFile" xml:space="preserve">
+    <value>Could not infer ODBC driver. No file specified</value>
   </data>
+  <data name="icon_zoomprev" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_zoomprev.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="exclamation" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\exclamation.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="ConfigurationDocumentReset" xml:space="preserve">
+    <value>Configuration Document has been reset</value>
+  </data>
   <data name="OverwriteResource" xml:space="preserve">
     <value>This resource already exists, continue with save?</value>
     <comment>Question similar to the standard response of saving to an exisiting file using the regular save file dialog</comment>
@@ -904,26 +988,29 @@
   <data name="icon_clearselect_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_clearselect_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon_measure" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_measure.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="LoadProcedureVersionExecutionNotSupported" xml:space="preserve">
+    <value>This connection does not support executing this type of Load Procedure</value>
   </data>
-  <data name="IncompatibleConnection" xml:space="preserve">
-    <value>This connection is not compatible</value>
+  <data name="StandardQuery" xml:space="preserve">
+    <value>Standard Query</value>
   </data>
-  <data name="InvalidColorComponent" xml:space="preserve">
-    <value>Invalid {0} color component {1} in line {2}</value>
-    <comment>An error message that is displayed if a color component is outside the [0-255] range.
-{0} is the color component, eg. R, G or B
-{1} is the value read
-{2} is the line where the error was encountered</comment>
+  <data name="TooMuchDataWarning" xml:space="preserve">
+    <value>The selected column contains more than {0} different values.
+The calculated averages only accounts for the first {0} distinct values.</value>
+    <comment>A warning message that is displayed if the dataset is too large</comment>
   </data>
-  <data name="TooManyIndiviualValuesError" xml:space="preserve">
-    <value>The selected column contains more than {0} different values, and thus cannot be used for theming with individual values</value>
-    <comment>An error message that is displayed if the selected column has too many distinct values</comment>
+  <data name="globe--arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\globe--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon_zoomin_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_zoomin_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="OdbcDriverAccess" xml:space="preserve">
+    <value>{Microsoft Access Driver (*.mdb)}</value>
   </data>
+  <data name="NoRasterClasses" xml:space="preserve">
+    <value>This feature source has no class definitions with raster properties</value>
+  </data>
+  <data name="tick" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\tick.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="FilterDwf" xml:space="preserve">
     <value>Autodesk DWF (*.dwf)|*.dwf</value>
   </data>
@@ -939,9 +1026,8 @@
   <data name="sql-join-inner" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sql-join-inner.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="PackageReadError" xml:space="preserve">
-    <value>Failed to read package. Error message was: {0}</value>
-    <comment>A message displayed when the package could not be read</comment>
+  <data name="icon_tasks" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_tasks.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="sql" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sql.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -959,8 +1045,9 @@
   <data name="layers-stack-arrange-back" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\layers-stack-arrange-back.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="document--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\document--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="FontPreviewError" xml:space="preserve">
+    <value>Cannot Preview Font "{0}"</value>
+    <comment>An error message that is displayed when the rendering fails, using the specified font</comment>
   </data>
   <data name="plus-circle" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\plus-circle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -972,22 +1059,22 @@
     <value>The folder must start with \"Library://\", do you want the starting folder to become:\n {0} ?</value>
     <comment>A message that is displayed when the user has not entered a folder starting with Library://</comment>
   </data>
-  <data name="property" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\property.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="FilterAll" xml:space="preserve">
+    <value>All File Types (*.*)|*.*</value>
   </data>
   <data name="ContentFileMissing" xml:space="preserve">
     <value>The content file does not exist</value>
     <comment>A message displayed when the user selects a non-existing file</comment>
   </data>
-  <data name="SelectFeatureClass" xml:space="preserve">
-    <value>Select Feature Class</value>
+  <data name="icon_selectwithin" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_selectwithin.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="sum" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sum.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="InvalidValueError" xml:space="preserve">
-    <value>Invalid value</value>
-    <comment>An error message that is displayed when the entered value is invalid</comment>
+  <data name="SelectColumnPlaceholder" xml:space="preserve">
+    <value>&lt;Select column&gt;</value>
+    <comment>A placeholder message displayed when the user has not yet selected a column</comment>
   </data>
   <data name="XmlDocIsValid" xml:space="preserve">
     <value>Document is valid</value>
@@ -1004,8 +1091,8 @@
   <data name="database--plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\database--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="InvokeScriptCmdDescription" xml:space="preserve">
-    <value>Invoke Script Command</value>
+  <data name="arrow-090" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrow-090.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="cross" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\cross.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -1013,8 +1100,8 @@
   <data name="CommandTypesDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\CommandTypesDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
-  <data name="icon_selectradius_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_selectradius_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="arrow-curve" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrow-curve.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="edit-indent" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\edit-indent.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -1022,103 +1109,25 @@
   <data name="FindEmptyString" xml:space="preserve">
     <value>Cannot Find an Empty String</value>
   </data>
+  <data name="CoordinateTransformationFailed" xml:space="preserve">
+    <value>Failed to transform coordinates: {0}</value>
+  </data>
   <data name="FsMySql" xml:space="preserve">
     <value>MySQL Feature Source</value>
   </data>
   <data name="icon_forward_disabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_forward_disabled.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon_copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_copy.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icon_zoomnext" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_zoomnext.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="GeometryStyleComboDataset" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\GeometryStyleComboDataset.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  <data name="document" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\document.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ui-separator" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ui-separator.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ProcessedItem" xml:space="preserve">
+    <value>Processed: {0}</value>
   </data>
-  <data name="AddWidgetReference" xml:space="preserve">
-    <value>Add Widget Reference</value>
+  <data name="UpdatingConfiguration" xml:space="preserve">
+    <value>Updating Configuration Document</value>
   </data>
-  <data name="SelectWidget" xml:space="preserve">
-    <value>Select widget</value>
-  </data>
-  <data name="Separator" xml:space="preserve">
-    <value>Separator</value>
-  </data>
-  <data name="CustomCommandsExported" xml:space="preserve">
-    <value>Custom commands exported to {0}</value>
-  </data>
-  <data name="CustomCommandsImported" xml:space="preserve">
-    <value>{0} custom commands imported from {1}. The following commands had to be renamed to prevent clashes: {2}</value>
-  </data>
-  <data name="ExportNoCommandsSelected" xml:space="preserve">
-    <value>No commands selected. Nothing to export</value>
-  </data>
-  <data name="ExportNoCustomCommandsSelected" xml:space="preserve">
-    <value>No custom commands selected. Nothing to export</value>
-  </data>
-  <data name="FilterXml" xml:space="preserve">
-    <value>XML Files (.xml)|*.xml</value>
-  </data>
-  <data name="ConfirmDeleteResourceData" xml:space="preserve">
-    <value>Are you sure you want to delete this resource data?</value>
-  </data>
-  <data name="InvokeUrlNoMapDefined" xml:space="preserve">
-    <value>Cannot get layers. No map definition specified</value>
-  </data>
-  <data name="SelectLayerFirst" xml:space="preserve">
-    <value>Please select the layer first</value>
-  </data>
-  <data name="CoordinateTransformationFailed" xml:space="preserve">
-    <value>Failed to transform coordinates: {0}</value>
-  </data>
-  <data name="OdbcDriverAccess" xml:space="preserve">
-    <value>{Microsoft Access Driver (*.mdb)}</value>
-  </data>
-  <data name="OdbcDriverAccess64" xml:space="preserve">
-    <value>{Microsoft Access Driver (*.mdb, *.accdb)}</value>
-  </data>
-  <data name="OdbcDriverExcel" xml:space="preserve">
-    <value>{Microsoft Excel Driver (*.xls)}</value>
-  </data>
-  <data name="OdbcDriverExcel64" xml:space="preserve">
-    <value>{Microsoft Excel Driver (*.xls, *.xlsx, *.xlsm, *.xlsb)}</value>
-  </data>
-  <data name="OdbcCannotInferDriver" xml:space="preserve">
-    <value>Could not infer ODBC driver from file name: {0}</value>
-  </data>
-  <data name="OdbcNoMarkedFile" xml:space="preserve">
-    <value>Could not infer ODBC driver. No file specified</value>
-  </data>
-  <data name="FdoConnectionStringComponentNotFound" xml:space="preserve">
-    <value>The component "{0}" could not be found in the specified FDO connection string</value>
-  </data>
-  <data name="OdbcConnectionStringComponentNotFound" xml:space="preserve">
-    <value>The component "{0}" could not be found in the specified ODBC connection string</value>
-  </data>
-  <data name="FdoConnectionStatus" xml:space="preserve">
-    <value>FDO Connection Status: {0}</value>
-  </data>
-  <data name="NoRasterClasses" xml:space="preserve">
-    <value>This feature source has no class definitions with raster properties</value>
-  </data>
-  <data name="Infinity" xml:space="preserve">
-    <value>Infinity</value>
-  </data>
-  <data name="SelectProperty" xml:space="preserve">
-    <value>Select Property</value>
-  </data>
-  <data name="NoSchemasInFeatureSource" xml:space="preserve">
-    <value>Feature Source has no schemas</value>
-  </data>
-  <data name="SelectSpatialContext" xml:space="preserve">
-    <value>Select Spatial Context</value>
-  </data>
-  <data name="CheckGeometryFirst" xml:space="preserve">
-    <value>Ensure the Geometry box is checked</value>
-  </data>
-  <data name="ConfigurationDocumentReset" xml:space="preserve">
-    <value>Configuration Document has been reset</value>
-  </data>
 </root>
\ No newline at end of file

Added: sandbox/maestro-3.0/Maestro.Editors/Resources/document.png
===================================================================
(Binary files differ)


Property changes on: sandbox/maestro-3.0/Maestro.Editors/Resources/document.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: sandbox/maestro-3.0/OSGeo.MapGuide.MaestroAPI/ObjectModels/IFdoSpatialContext.cs
===================================================================
--- sandbox/maestro-3.0/OSGeo.MapGuide.MaestroAPI/ObjectModels/IFdoSpatialContext.cs	2011-03-07 09:24:36 UTC (rev 5602)
+++ sandbox/maestro-3.0/OSGeo.MapGuide.MaestroAPI/ObjectModels/IFdoSpatialContext.cs	2011-03-07 13:47:28 UTC (rev 5603)
@@ -183,6 +183,23 @@
                 throw new Exception("Bad document. Expected element gml:DerivedCRS"); //LOCALIZEME
 
             var meta = node["gml:metaDataProperty"];
+            var genMeta = meta["gml:GenericMetaData"];
+
+            var scType = genMeta["fdo:SCExtentType"];
+            var xyTol = genMeta["fdo:XYTolerance"];
+            var zTol = genMeta["fdo:ZTolerance"];
+
+            this.ExtentType = (scType == null || scType.InnerText == "dynamic") ? FdoSpatialContextListSpatialContextExtentType.Dynamic : FdoSpatialContextListSpatialContextExtentType.Static;
+
+            double xy_tol;
+            double z_tol;
+
+            if (double.TryParse(xyTol.InnerText, out xy_tol))
+                this.XYTolerance = xy_tol;
+
+            if (double.TryParse(zTol.InnerText, out z_tol))
+                this.ZTolerance = z_tol;
+
             var remarks = node["gml:remarks"];
             var srsName = node["gml:srsName"];
             var ext = node["gml:validArea"];

Modified: sandbox/maestro-3.0/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/GdalRasterItem.cs
===================================================================
--- sandbox/maestro-3.0/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/GdalRasterItem.cs	2011-03-07 09:24:36 UTC (rev 5602)
+++ sandbox/maestro-3.0/OSGeo.MapGuide.MaestroAPI/SchemaOverrides/GdalRasterItem.cs	2011-03-07 13:47:28 UTC (rev 5603)
@@ -48,6 +48,8 @@
             {
                 item.WriteXml(doc, loc);   
             }
+
+            currentNode.AppendChild(loc);
         }
 
         public void ReadXml(System.Xml.XmlNode node, System.Xml.XmlNamespaceManager mgr)
@@ -66,6 +68,21 @@
                 AddItem(raster);
             }
         }
+
+        public void RemoveItem(string fileName)
+        {
+            GdalRasterItem item = null;
+            foreach (var raster in _items)
+            {
+                if (raster.FileName == fileName)
+                {
+                    item = raster;
+                }
+            }
+
+            if (item != null)
+                _items.Remove(item);
+        }
     }
 
     public class GdalRasterItem : IFdoSerializable



More information about the mapguide-commits mailing list