Index: Core/GIS/src/Core.GIS.SharpMap.UI/Core.GIS.SharpMap.UI.csproj =================================================================== diff -u -ra772c49f0c4e64a606d832165c4f55f617a6e663 -r37b92ac1ba7a5d381aedd8e287443450e0c2d7aa --- Core/GIS/src/Core.GIS.SharpMap.UI/Core.GIS.SharpMap.UI.csproj (.../Core.GIS.SharpMap.UI.csproj) (revision a772c49f0c4e64a606d832165c4f55f617a6e663) +++ Core/GIS/src/Core.GIS.SharpMap.UI/Core.GIS.SharpMap.UI.csproj (.../Core.GIS.SharpMap.UI.csproj) (revision 37b92ac1ba7a5d381aedd8e287443450e0c2d7aa) @@ -141,6 +141,10 @@ Core.Common.Base False + + {9A2D67E6-26AC-4D17-B11A-2B4372F2F572} + Core.Common.Controls + {F49BD8B2-332A-4C91-A196-8CCE0A2C7D98} Core.Common.Utils Index: Core/GIS/src/Core.GIS.SharpMap.UI/Forms/SelectCoordinateSystemDialog.Designer.cs =================================================================== diff -u -r68c2490eee7589383d96502427395b71140684cf -r37b92ac1ba7a5d381aedd8e287443450e0c2d7aa --- Core/GIS/src/Core.GIS.SharpMap.UI/Forms/SelectCoordinateSystemDialog.Designer.cs (.../SelectCoordinateSystemDialog.Designer.cs) (revision 68c2490eee7589383d96502427395b71140684cf) +++ Core/GIS/src/Core.GIS.SharpMap.UI/Forms/SelectCoordinateSystemDialog.Designer.cs (.../SelectCoordinateSystemDialog.Designer.cs) (revision 37b92ac1ba7a5d381aedd8e287443450e0c2d7aa) @@ -50,10 +50,10 @@ | System.Windows.Forms.AnchorStyles.Right))); this.treeViewProjections.ImageIndex = 0; this.treeViewProjections.ImageList = this.imageList; - this.treeViewProjections.Location = new System.Drawing.Point(0, 26); + this.treeViewProjections.Location = new System.Drawing.Point(3, 26); this.treeViewProjections.Name = "treeViewProjections"; this.treeViewProjections.SelectedImageIndex = 0; - this.treeViewProjections.Size = new System.Drawing.Size(495, 406); + this.treeViewProjections.Size = new System.Drawing.Size(433, 299); this.treeViewProjections.StateImageList = this.imageList; this.treeViewProjections.TabIndex = 1; // @@ -75,15 +75,14 @@ this.textBoxSrs.Multiline = true; this.textBoxSrs.Name = "textBoxSrs"; this.textBoxSrs.ReadOnly = true; - this.textBoxSrs.Size = new System.Drawing.Size(414, 432); + this.textBoxSrs.Size = new System.Drawing.Size(350, 325); this.textBoxSrs.TabIndex = 0; // // textBoxFilter // - this.textBoxFilter.Dock = System.Windows.Forms.DockStyle.Top; - this.textBoxFilter.Location = new System.Drawing.Point(0, 0); + this.textBoxFilter.Location = new System.Drawing.Point(3, 3); this.textBoxFilter.Name = "textBoxFilter"; - this.textBoxFilter.Size = new System.Drawing.Size(495, 20); + this.textBoxFilter.Size = new System.Drawing.Size(433, 20); this.textBoxFilter.TabIndex = 0; this.textBoxFilter.TextChanged += new System.EventHandler(this.textBoxFilter_TextChanged); // @@ -92,7 +91,7 @@ this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.splitContainer1.Location = new System.Drawing.Point(4, 12); + this.splitContainer1.Location = new System.Drawing.Point(0, 0); this.splitContainer1.Name = "splitContainer1"; // // splitContainer1.Panel1 @@ -104,15 +103,15 @@ // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.textBoxSrs); - this.splitContainer1.Size = new System.Drawing.Size(913, 432); - this.splitContainer1.SplitterDistance = 495; + this.splitContainer1.Size = new System.Drawing.Size(793, 325); + this.splitContainer1.SplitterDistance = 439; this.splitContainer1.TabIndex = 4; // // buttonCancel // this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.buttonCancel.Location = new System.Drawing.Point(836, 452); + this.buttonCancel.Location = new System.Drawing.Point(714, 331); this.buttonCancel.Name = "buttonCancel"; this.buttonCancel.Size = new System.Drawing.Size(75, 23); this.buttonCancel.TabIndex = 2; @@ -123,7 +122,7 @@ // this.buttonOk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonOk.DialogResult = System.Windows.Forms.DialogResult.OK; - this.buttonOk.Location = new System.Drawing.Point(750, 452); + this.buttonOk.Location = new System.Drawing.Point(633, 331); this.buttonOk.Name = "buttonOk"; this.buttonOk.Size = new System.Drawing.Size(75, 23); this.buttonOk.TabIndex = 1; @@ -133,17 +132,11 @@ // SelectCoordinateSystemDialog // this.AcceptButton = this.buttonOk; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this.buttonCancel; - this.ClientSize = new System.Drawing.Size(921, 486); + this.ClientSize = new System.Drawing.Size(793, 359); this.Controls.Add(this.buttonCancel); this.Controls.Add(this.buttonOk); this.Controls.Add(this.splitContainer1); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "SelectCoordinateSystemDialog"; - this.ShowInTaskbar = false; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Choose coordinate system"; this.splitContainer1.Panel1.ResumeLayout(false); this.splitContainer1.Panel1.PerformLayout(); Index: Core/GIS/src/Core.GIS.SharpMap.UI/Forms/SelectCoordinateSystemDialog.cs =================================================================== diff -u -r9f01c4daf5b7af6549045ed6ac404d18419c2555 -r37b92ac1ba7a5d381aedd8e287443450e0c2d7aa --- Core/GIS/src/Core.GIS.SharpMap.UI/Forms/SelectCoordinateSystemDialog.cs (.../SelectCoordinateSystemDialog.cs) (revision 9f01c4daf5b7af6549045ed6ac404d18419c2555) +++ Core/GIS/src/Core.GIS.SharpMap.UI/Forms/SelectCoordinateSystemDialog.cs (.../SelectCoordinateSystemDialog.cs) (revision 37b92ac1ba7a5d381aedd8e287443450e0c2d7aa) @@ -2,11 +2,13 @@ using System.Collections.Generic; using System.Linq; using System.Windows.Forms; +using Core.Common.Controls.Dialogs; using Core.GIS.GeoAPI.CoordinateSystems; +using Core.GIS.SharpMap.UI.Properties; namespace Core.GIS.SharpMap.UI.Forms { - public partial class SelectCoordinateSystemDialog : Form + public partial class SelectCoordinateSystemDialog : DialogBase { private readonly List gcsNodes = new List(); private readonly List pcsNodes = new List(); @@ -18,7 +20,7 @@ private readonly string geographicNodeName = "geographic"; private readonly string projectedNodeName = "projected"; - public SelectCoordinateSystemDialog(IList supportedCoordinateSystems, IList customCoordinateSystems) + public SelectCoordinateSystemDialog(IWin32Window owner, IList supportedCoordinateSystems, IList customCoordinateSystems) : base(owner, Resources.globe__pencil) { this.supportedCoordinateSystems = supportedCoordinateSystems; this.customCoordinateSystems = customCoordinateSystems; @@ -52,7 +54,7 @@ protected override void OnLoad(EventArgs e) { - CenterToScreen(); + base.OnLoad(e); FillProjectionsTreeView(); @@ -241,5 +243,10 @@ treeViewProjections.EndUpdate(); } } + + protected override Button GetCancelButton() + { + return buttonCancel; + } } } \ No newline at end of file Index: Core/GIS/src/Core.GIS.SharpMap.UI/Forms/SelectCoordinateSystemDialog.resx =================================================================== diff -u -r68c2490eee7589383d96502427395b71140684cf -r37b92ac1ba7a5d381aedd8e287443450e0c2d7aa --- Core/GIS/src/Core.GIS.SharpMap.UI/Forms/SelectCoordinateSystemDialog.resx (.../SelectCoordinateSystemDialog.resx) (revision 68c2490eee7589383d96502427395b71140684cf) +++ Core/GIS/src/Core.GIS.SharpMap.UI/Forms/SelectCoordinateSystemDialog.resx (.../SelectCoordinateSystemDialog.resx) (revision 37b92ac1ba7a5d381aedd8e287443450e0c2d7aa) @@ -124,100 +124,75 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAU - DwAAAk1TRnQBSQFMAgEBAwEAAXgBAAF4AQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAM + DwAAAk1TRnQBSQFMAgEBAwEAAZQBAAGUAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA AwABEAMAAQEBAAEgBgABEP8AWwADAQECAwoBDgMSARgDEwEaAxMBGgMTARoDEwEaAxMBGgMTARoDEgEZ AwwBEAMCAQMIAAM7AWUDSAGHA0gBhwNIAYcDSAGHA0gBhwNIAYcDSAGHA0gBhwNIAYcDSAGHA0gBhwNI - AYcDSAGHAzsBZUgAA0ABcAFSAlQBpgFVAV4BZgHqAUIBbgGOAfcBQgFuAY4B9wFCAW4BjgH3AUIBbgGO - AfcBQgFuAY4B9wFCAW4BjgH3AUIBbgGOAfcBQgFuAY4B9wFCAW0BjgH3AVMBZwF7AfEDTAGTDAADAwEE + AYcDSAGHAzsBZUgAA0ABcAFSAlQBpgFVAVwBYwHqAUgBbQGJAfcBSAFtAYkB9wFIAW0BiQH3AUgBbQGJ + AfcBSAFtAYkB9wFIAW0BiQH3AUgBbQGJAfcBSAFtAYkB9wFIAW0BiQH3AVMBZAFyAfEDTAGTDAADAwEE AxQBGwMmATgDQQFyAlIBUQGnAlsBWQHDAlsBWQHDAlIBUQGnA0EBcgMmATkDFgEfAwQBBggAA0YBgQL5 AekB/wLzAeIB/wLzAeIB/wLzAeIB/wLzAeIB/wLzAeIB/wLzAeIB/wLzAeIB/wLzAeIB/wLzAeIB/wLz - AeIB/wLzAeIB/wL5AekB/wNGAYFIAAFYAWEBZwHmAXIBdgF3AfABpwG6AcgB/QGeAdsB9AH/AZYB2gHz - Af8BjgHYAfMB/wGGAdcB8wH/AXAB1AHyAf8BagHTAfIB/wFjAdIB8QH/AV0B0AHxAf8BWgHPAfEB/wGl - Ac0B2wH+AU4BZQFwAfAQAAMSARkCUwFPAaUCXgFYAd0BggFwAV8B8wHIAagBXgH9AcgBqAFeAf0BggFw - AV8B8wJeAVgB3QJTAU8BpQMSARkMAANEAXoC9AHkAf8BawGnAZsB/wGHAbcBpwH/AYcBtQGjAf8BiQGz - AaIB/wFZAaABhgH/AUgBlwFpAf8BSQGTAWoB/wFZAZABbwH/AZIBpAGTAf8BhgGXAYAB/wKoAY4B/wL0 - AeQB/wNEAXpIAAFKAX0BkgH3Ae8B+gH+Af8BoQHpAfkB/wGRAeUB+AH/AYEB4QH3Af8BYwHeAfYB/wFU - AdoB9QH/AUUB1wH0Af8BOAHTAfMB/wEqAdAB8gH/AR8BzQHxAf8BFwHLAfAB/wHKAfIB+wH/AUoBfQGS - AfcMAAMKAQ0BVAJSAaYBZgFfAVcB6AHuAawBVQH/Ae8BrgFZAf8B7wGxAV4B/wHvAbEBXgH/AewBqwFY - Af8B7gG/AW8B/wFnAWQBVwHoAVQCUgGmAwoBDQgAA0MBdwL1AeYB/wGEAbUBqwH/AZgB1wHHAf8BkAHR - Ab4B/wFkAbABmQH/AZcBywG2Af8BpwHOAb0B/wGXAb0BrAH/AZQBugGoAf8BqQG/Aa8B/wGOAa0BoQH/ - AbcBrQGLAf8C9QHmAf8DQwF3SAABPgF6AZcB+AHyAfoB/QH/AbMB7QH6Af8BpAHpAfkB/wGVAeYB+AH/ - AYUB4gH3Af8BZwHeAfYB/wFWAdsB9QH/AUgB1wH0Af8BOgHUAfMB/wEsAdEB8gH/ASEBzgHxAf8BzAHy - AfsB/wFKAX8BkgH3DAADNwFaAl4BWAHdAeABmwE3Af8B4gGdATsB/wHjAaIBQgH/AeQBpAFGAf8B4wGj - AUYB/wHeAZwBQAH/AeYBqgFOAv8BywFmAf8CXgFYAd0DNwFaCAADQgF1AvYB6QH/AZABvAG1Af8BuQHl - AdsB/wGmAd0B0AH/AYgBwAGyAf8BhwHJAbUB/wFvAb4BpAH/AYgBuQGjAf8BrgHQAb8B/wGpAccBtQH/ - AZQBugGoAf8BtgG1AZEB/wL2AekB/wNCAXVIAAFBAYUBmQH5AfYB/AH+Af8ByAHyAfwB/wG5Ae8B+wH/ - AawB7AH6Af8BnAHoAfkB/wGLAeMB9wH/AW0B4AH2Af8BXQHcAfYB/wFOAdkB9QH/AUAB1gH0Af8BNQHT - AfMB/wHQAfMB/AH/AUoBgQGSAfcMAAFSAlEBoQF3AWABTAHzAdIBjAEfAf8B1QGSASYB/wHWAZUBKwH/ - AdYBlgEtAf8B1AGTASwB/wHeAZgBMwH/AdEBigErAv8BtAFEAf8BgQFvAUwB8wFSAlEBoQgAAkIBQQFz - AvcB6wH/AcUBuAGHAv8B3gGMAf8B+AHnAa0B/wHVAdEBsAH/AcoB6wHiAf8BvQHlAdkB/wGgAcoBuwH/ - AaoBzgGvAf8BggHBAaQB/wFvAbYBmAH/AZgBrAGEAf8C9wHrAf8CQgFBAXNIAAFGAYABoAH6Af4D/wH4 - Af0C/wH2Af0C/wH1AfwC/wHzAfwB/gH/AdgB9gH8Af8BlAHmAfgB/wGFAeMB9wH/AWcB3wH2Af8BWQHb - AfUB/wFNAdgB9AH/AdcB9AH8Af8BSgGDAZIB9wwAAVsCWQHDAbMBgwFAAf0B0QGJAR0B/wHMAYoBGgH/ - Ac8BjgEeAf8BzwGOAR8B/wHGAYQBGwH/AdQBigEmAf8B1wGLASYB/wHoAZkBLgH/AbYBiQFAAf0BWwJZ - AcMIAANBAXIC+AHuAf8B0QGuAVoB/wHbAboBYgH/Ad4BvgFlAf8B6QHJAW0B/wG/Ac0BqAH/AZUBzAHC - Af8BoQHPAb4B/wGRAcQBrwH/AXABvQGmAf8BaAG3AZ0B/wGoAaoBaAH/AvgB7gH/A0EBckgAAUQBhgGg - AfoB6AH2AfsB/wGUAdQB7wH/AYgBzgHuAf8BZAHBAekB/wHJAekB9gH/AfIB/AH+Af8B8wH8Af4B/wHy - AfwB/gH/AfAB/AH+Af8B7wH7Af4B/wHuAfsB/gH/Af4D/wFMAYUBkgH3DAABWAJWAcEBsgF5ATgB/AHb - AZYBLwH/Ac4BkAEjAf8B0wGXASoB/wHQAZUBKgH/Ad8BnwE7Af8B/QG5AVUB/wHYAZQBNAH/AcUBhAEd - Af8BngFyASsB/AFYAlYBwQgAA0ABcAL5AfEB/wHTAawBVwL/AdMBbwL/AdYBggH/AeABvgFlAf8B9gHh - AZkB/wGwAe0B5AH/Aa8B0QG/Af8BogHgAdMB/wGYAdgBxgH/AY4B0AG6Af8BuAGyAYAB/wL5AfEB/wNA - AXBIAAFTAXIBewHyAfEB+gH9Af8BlAHeAfUB/wGTAdwB9AH/AYEB1QHyAf8BWwHKAe0B/wFdAcsB6gH/ - AYUB0wHvAf8BgAHSAe8B/wFrAdAB7wH/AWcBzwHuAf8BYwHPAe4B/wHpAfcB+wH/AUwBcQGAAfMMAANQ - AZ4BewFpAVkB8gHQAZUBMgH/AdgBowFDAf8B2AGkAUYB/wHZAagBTQH/AeIBtAFkAf8BzAGVAUQC/wHS - AYsB/wHjAa4BVAH/AXkBZwFVAfIDUAGeCAADQAFuAvsB9AH/AdUBqQFTAv8BzgFqAv8B0gFuAf8B3wG6 - AWAC/wHYAYMB/wHmAeoBvQH/AaYB2AHNAf8BswHsAeIB/wG5AeQB0AH/AbYB3AHEAf8BqwG+AZcB/wL7 - AfQB/wNAAW5IAAFOAWkBcgHwAfcB/AH+Af8BjgHkAfgB/wGRAd4B9QH/AZ8B4AH1Af8BrAHhAfYB/wHv - AfsB/gH/AfQB/QH+Af8B8wH8Af4B/wHxAfwB/gH/Ae8B+wH+Af8B7gH7Af4B/wGqAawBrQH5AVwCYAHU - DAADNQFXAl4BWgHYAeIBtwFnAf8B7QHKAY8B/wH1AdwBqAH/AeABtgFsAv8B6wG8Af8B6AHJAZYC/wHp - AbIB/wH7AeEBpwH/Al4BWgHYAzUBVwgAAz8BbQL8AfcB/wHXAacBUAH/AdoBrAFVAf8B3AGwAVgB/wHn - AbwBYQH/AeABugFgAf8B4wG+AWQB/wHfAdEBmAH/AdsBzwGWAf8B1QHRAZwB/wHEAc0BpAH/AZ0B0QHD - Af8C/AH3Af8DPwFtSAABPgGFAZcB+AH9Av4B/wH+A/8C/gL/Af0B/gL/Af4D/wHqAfcB+wH/AWoBkAGe - AfkBXAGRAZoB+AFcAZEBmgH4AVwBkQGaAfgBbQGMAZYB9wNhAeEDNQFWDAADCQEMA1ABnQFiAl8B4wHi - AbsBgQH/AfoB7AG+Af8B6AHBAYcB/wHsAc8BngL/AfcBzAL/AfcBygH/AWICXwHjA1ABnQMJAQwIAAM+ - AWsC/QH5Af8B2QGkAU0C/wHEAWAC/wHIAWQB/wHeAbABWAL/Ac4BagL/AdIBbgH/AeQBvgFjAv8B2AGD - Af8B7QHkAagB/wHiAeYBtgH/AdAB1wGtAf8C/QH5Af8DPgFrSAABWwJeAdABTQGVAaQB+gFNAZYBpAH6 - AU0BlgGkAfoBTQGWAaQB+gFNAZYBpAH6AVgBXgFfAd0DEAEWAwsBDwMLAQ8DCwEPAwsBDwMLAQ8DAwEE - EAADEQEXAlEBTwGcAmABXAHUAXYBbAFdAfABuwGwAXoB/AG9AbcBkQH8AXYBcgFoAfACYAFcAdQCUQFP - AZwDEQEXDAADPgFqAv4B/AH/AdoBowFLAv8BvwFcAv8BwgFfAf8B3gGsAVMC/wHJAWUC/wHNAWkB/wHj - AbkBXwL/AdMBbwL/AdcBgwH/AfwB3gGVAf8B7AHKAW0B/wL+AfwB/wM+AWqUAAMJAQwDNAFUAk4BTQGW - A1UBtQNVAbUCTgFNAZYDNAFUAwkBDBAAAz0BaAL/Af4B/wHbAaEBSQH/AdsBogFKAf8B2wGkAUwB/wHb - AaUBTgH/AdsBqQFRAf8B2wGsAVQB/wHbAa8BVwH/AdsBsQFZAf8B2wG0AVwB/wHbAbcBXwH/AdsBuQFi - A/8B/gH/Az0BaMQAAz0BZzT/Az0BZ8QAAzEBTQM8AWYDPAFmAzwBZgM8AWYDPAFmAzwBZgM8AWYDPAFm - AzwBZgM8AWYDPAFmAzwBZgM8AWYDMQFNRAABQgFNAT4HAAE+AwABKAMAAUADAAEQAwABAQEAAQEFAAGA - FwAD/wEABv8CAAL/AcABAwEAAQECAAGAAQEBwAEDAQABAQIAAYABAQHgAQcBAAEBAgABgAEBAcABAwEA - AQECAAGAAQEBwAEDAQABAQIAAYABAQHAAQMBAAEBAgABgAEBAcABAwEAAQECAAGAAQEBwAEDAQABAQIA - AYABAQHAAQMBAAEBAgABgAEBAcABAwEAAQECAAGAAQEBwAEDAQABAQIAAYABAQHgAQcBAAEBAgAC/wHw - AQ8BAAEBAgAE/wEAAQECAAT/AQABAQIACw== + AeIB/wLzAeIB/wL5AekB/wNGAYFIAAFYAWEBYgHmAWoCbAHwAacBtwG/Af0BngHbAfQB/wGWAdoB8wH/ + AY4B2AHzAf8BhgHXAfMB/wFtAdQB8gH/AWcB0wHyAf8BYAHSAfEB/wFaAdAB8QH/AVcBzwHxAf8BnwHH + AdUB/gFOAV8BaQHwEAADEgEZAlMBTwGlAl4BWAHdAXsBbQFfAfMBvwGoAVgB/QG/AagBWAH9AXsBbQFf + AfMCXgFYAd0CUwFPAaUDEgEZDAADRAF6AvQB5AH/AWgBpwGbAf8BhwG3AacB/wGHAbUBowH/AYkBswGi + Af8BVgGgAYYB/wFFAZcBZgH/AUYBkwFnAf8BVgGQAWwB/wGSAaQBkwH/AYYBlwGAAf8CqAGOAf8C9AHk + Af8DRAF6SAABUAF0AYoB9wHvAfoB/gH/AaEB6QH5Af8BkQHlAfgB/wGBAeEB9wH/AWAB3gH2Af8BUQHa + AfUB/wFCAdcB9AH/ATUB0wHzAf8BJwHQAfIB/wEcAc0B8QH/ARQBywHwAf8BygHyAfsB/wFQAXQBigH3 + DAADCgENAVQCUgGmAWMBXwFXAegB7gGsAVIB/wHvAa4BVgH/Ae8BsQFbAf8B7wGxAVsB/wHsAasBVQH/ + Ae4BvwFsAf8BZAFgAVcB6AFUAlIBpgMKAQ0IAANDAXcC9QHmAf8BhAG1AasB/wGYAdcBxwH/AZAB0QG+ + Af8BYQGwAZkB/wGXAcsBtgH/AacBzgG9Af8BlwG9AawB/wGUAboBqAH/AakBvwGvAf8BjgGtAaEB/wG3 + Aa0BiwH/AvUB5gH/A0MBd0gAAT4BdwGRAfgB8gH6Af0B/wGzAe0B+gH/AaQB6QH5Af8BlQHmAfgB/wGF + AeIB9wH/AWQB3gH2Af8BUwHbAfUB/wFFAdcB9AH/ATcB1AHzAf8BKQHRAfIB/wEeAc4B8QH/AcwB8gH7 + Af8BUAF3AYoB9wwAAzcBWgJeAVgB3QHgAZsBNAH/AeIBnQE4Af8B4wGiAT8B/wHkAaQBQwH/AeMBowFD + Af8B3gGcAT0B/wHmAaoBSwL/AcsBYwH/Al4BWAHdAzcBWggAA0IBdQL2AekB/wGQAbwBtQH/AbkB5QHb + Af8BpgHdAdAB/wGIAcABsgH/AYcByQG1Af8BbAG+AaQB/wGIAbkBowH/Aa4B0AG/Af8BqQHHAbUB/wGU + AboBqAH/AbYBtQGRAf8C9gHpAf8DQgF1SAABQQGCAZAB+QH2AfwB/gH/AcgB8gH8Af8BuQHvAfsB/wGs + AewB+gH/AZwB6AH5Af8BiwHjAfcB/wFqAeAB9gH/AVoB3AH2Af8BSwHZAfUB/wE9AdYB9AH/ATIB0wHz + Af8B0AHzAfwB/wFQAX0BigH3DAABUgJRAaEBcAFfAUwB8wHSAYwBHAH/AdUBkgEjAf8B1gGVASgB/wHW + AZYBKgH/AdQBkwEpAf8B3gGYATAB/wHRAYoBKAL/AbQBQQH/AXgBbAFMAfMBUgJRAaEIAAJCAUEBcwL3 + AesB/wHFAbgBhwL/Ad4BjAH/AfgB5wGtAf8B1QHRAbAB/wHKAesB4gH/Ab0B5QHZAf8BoAHKAbsB/wGq + Ac4BrwH/AYIBwQGkAf8BbAG2AZgB/wGYAawBhAH/AvcB6wH/AkIBQQFzSAABSQF8AZoB+gH+A/8B+AH9 + Av8B9gH9Av8B9QH8Av8B8wH8Af4B/wHYAfYB/AH/AZQB5gH4Af8BhQHjAfcB/wFkAd8B9gH/AVYB2wH1 + Af8BSgHYAfQB/wHXAfQB/AH/AVABgAGKAfcMAAFbAlkBwwGwAYMBQAH9AdEBiQEaAf8BzAGKARcB/wHP + AY4BGwH/Ac8BjgEcAf8BxgGEARgB/wHUAYoBIwH/AdcBiwEjAf8B6AGZASsB/wGzAYkBQAH9AVsCWQHD + CAADQQFyAvgB7gH/AdEBrgFXAf8B2wG6AV8B/wHeAb4BYgH/AekByQFqAf8BvwHNAagB/wGVAcwBwgH/ + AaEBzwG+Af8BkQHEAa8B/wFtAb0BpgH/AWUBtwGdAf8BqAGqAWUB/wL4Ae4B/wNBAXJIAAFHAX4BmgH6 + AegB9gH7Af8BlAHUAe8B/wGIAc4B7gH/AWEBwQHpAf8ByQHpAfYB/wHyAfwB/gH/AfMB/AH+Af8B8gH8 + Af4B/wHwAfwB/gH/Ae8B+wH+Af8B7gH7Af4B/wH+A/8BUQGCAYoB9wwAAVgCVgHBAawBdgE1AfwB2wGW + ASwB/wHOAZABIAH/AdMBlwEnAf8B0AGVAScB/wHfAZ8BOAH/Af0BuQFSAf8B2AGUATEB/wHFAYQBGgH/ + AZUBbwErAfwBWAJWAcEIAANAAXAC+QHxAf8B0wGsAVQC/wHTAWwC/wHWAYIB/wHgAb4BYgH/AfYB4QGZ + Af8BsAHtAeQB/wGvAdEBvwH/AaIB4AHTAf8BmAHYAcYB/wGOAdABugH/AbgBsgGAAf8C+QHxAf8DQAFw + SAABVwFqAXUB8gHxAfoB/QH/AZQB3gH1Af8BkwHcAfQB/wGBAdUB8gH/AVgBygHtAf8BWgHLAeoB/wGF + AdMB7wH/AYAB0gHvAf8BaAHQAe8B/wFkAc8B7gH/AWABzwHuAf8B6QH3AfsB/wFMAW4BdwHzDAADUAGe + AXUBZwFZAfIB0AGVAS8B/wHYAaMBQAH/AdgBpAFDAf8B2QGoAUoB/wHiAbQBYQH/AcwBlQFBAv8B0gGL + Af8B4wGuAVEB/wFyAWcBWAHyA1ABnggAA0ABbgL7AfQB/wHVAakBUAL/Ac4BZwL/AdIBawH/Ad8BugFd + Av8B2AGDAf8B5gHqAb0B/wGmAdgBzQH/AbMB7AHiAf8BuQHkAdAB/wG2AdwBxAH/AasBvgGXAf8C+wH0 + Af8DQAFuSAABTgFmAWoB8AH3AfwB/gH/AY4B5AH4Af8BkQHeAfUB/wGfAeAB9QH/AawB4QH2Af8B7wH7 + Af4B/wH0Af0B/gH/AfMB/AH+Af8B8QH8Af4B/wHvAfsB/gH/Ae4B+wH+Af8BngGhAaIB+QFcAmAB1AwA + AzUBVwJeAVoB2AHiAbcBZAH/Ae0BygGPAf8B9QHcAagB/wHgAbYBaQL/AesBvAH/AegByQGWAv8B6QGy + Af8B+wHhAacB/wJeAVoB2AM1AVcIAAM/AW0C/AH3Af8B1wGnAU0B/wHaAawBUgH/AdwBsAFVAf8B5wG8 + AV4B/wHgAboBXQH/AeMBvgFhAf8B3wHRAZgB/wHbAc8BlgH/AdUB0QGcAf8BxAHNAaQB/wGdAdEBwwH/ + AvwB9wH/Az8BbUgAAT4BfgGRAfgB/QL+Af8B/gP/Av4C/wH9Af4C/wH+A/8B6gH3AfsB/wFqAYwBkgH5 + AVwBiAGUAfgBXAGIAZQB+AFcAYgBlAH4AW0BiAGMAfcDYQHhAzUBVgwAAwkBDANQAZ0DXwHjAeIBuwGB + Af8B+gHsAb4B/wHoAcEBhwH/AewBzwGeAv8B9wHMAv8B9wHKAf8DXwHjA1ABnQMJAQwIAAM+AWsC/QH5 + Af8B2QGkAUoC/wHEAV0C/wHIAWEB/wHeAbABVQL/Ac4BZwL/AdIBawH/AeQBvgFgAv8B2AGDAf8B7QHk + AagB/wHiAeYBtgH/AdAB1wGtAf8C/QH5Af8DPgFrSAABWwJeAdABTQGMAZ4B+gFNAY0BngH6AU0BjQGe + AfoBTQGNAZ4B+gFNAY0BngH6AVgCXgHdAxABFgMLAQ8DCwEPAwsBDwMLAQ8DCwEPAwMBBBAAAxEBFwJR + AU8BnAJgAVwB1AFsAWgBXQHwAbUBqgF3AfwBtwGxAYgB/AFsAWoBZQHwAmABXAHUAlEBTwGcAxEBFwwA + Az4BagL+AfwB/wHaAaMBSAL/Ab8BWQL/AcIBXAH/Ad4BrAFQAv8ByQFiAv8BzQFmAf8B4wG5AVwC/wHT + AWwC/wHXAYMB/wH8Ad4BlQH/AewBygFqAf8C/gH8Af8DPgFqlAADCQEMAzQBVAJOAU0BlgNVAbUDVQG1 + Ak4BTQGWAzQBVAMJAQwQAAM9AWgC/wH+Af8B2wGhAUYB/wHbAaIBRwH/AdsBpAFJAf8B2wGlAUsB/wHb + AakBTgH/AdsBrAFRAf8B2wGvAVQB/wHbAbEBVgH/AdsBtAFZAf8B2wG3AVwB/wHbAbkBXwP/Af4B/wM9 + AWjEAAM9AWc0/wM9AWfEAAMxAU0DPAFmAzwBZgM8AWYDPAFmAzwBZgM8AWYDPAFmAzwBZgM8AWYDPAFm + AzwBZgM8AWYDPAFmAzEBTUQAAUIBTQE+BwABPgMAASgDAAFAAwABEAMAAQEBAAEBBQABgBcAA/8BAAb/ + AgAC/wHAAQMBAAEBAgABgAEBAcABAwEAAQECAAGAAQEB4AEHAQABAQIAAYABAQHAAQMBAAEBAgABgAEB + AcABAwEAAQECAAGAAQEBwAEDAQABAQIAAYABAQHAAQMBAAEBAgABgAEBAcABAwEAAQECAAGAAQEBwAED + AQABAQIAAYABAQHAAQMBAAEBAgABgAEBAcABAwEAAQECAAGAAQEB4AEHAQABAQIAAv8B8AEPAQABAQIA + BP8BAAEBAgAE/wEAAQECAAs= 58 - - - - AAABAAEAEBAAAAAAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAA - AAD///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af// - /wH///8B////Af///wH///8BtmQACblnAEm6ZwCVumcAubpnAMm6ZwC5umcAlblnAEm2ZAAJ////Af// - /wH///8B////Af///wH///8BsGAAI7FhAKXFdhzZ5ZtP8fGtavv2tHX/8a1q++WbT/HDcxvZsWEApbBg - ACP///8B////Af///wH///8BpFgAI6pdBLvUhzLr8Khe//Kwa//ztHP/87V2//O0c//ysGv/5JxZ/96n - VOurYAe7pFgAI////wH///8Blk4ACZlQAKXKfijr55lC/+mgTv/qpln/66pg/+urY//rqmD/6qZZ/9qR - SP//xm7/2ppE65lQAKWWTgAJ////AY1IAEmjXRLb3JEz/9yRMv/elTr/35lC/9+cR//gnUj/35tG/9yX - Qf/PhjX//7ZW//+2Vv+uaRzbjUgASf///wGFQwCVuHcr8dKJJv/Tiyj/1I4s/9SPMP/VkTL/1ZEy/9GN - MP/ckTf/0YQv/+iZO///rEf/3ZVD8YVDAJX///8BgEAAucuKO/vIgiH/zIck/86KJf/Oiif/zoon/wAA - AP9EYFL/rodH//WlRv+5bx7//61L/+mjUfuAQAC5////AYFBAMm8fzj/5Z5D/8mFJf/NjCj/zowp/86N - Kv9me13/2fT//zeDf/+znGD/uXQd/9SNMv/IjD7/gUEAyf///wGJRwC56LVx+9SVQf/Njy//1Jg4/9Sb - O//VnD7/spJM/0SdmP955vf/P46K/5WFTv/LizD/zphK+4lHALn///8Bl1EBk86dXu/Xnkj/2KBF/9ij - T//cqlf/3q1d/9+waf+io3f/PJaT/3nm9/89j47/oppn/86dWu+XUQGT////AaZcAUe4eirV2qlf/9+y - aP/02aH/5L6C/+S9ff/z2Kf//+2//6mzkf9Iq6z/eeb3/0GYm/+EbznfplwBR////wG1ZwIJumoCn92w - b+fnw4n/+Oe6//7yzP/v1KX/8tmt//jpw//88Mr/wuHG/0yztv955vf/XD4WzygdEDf///8B////Acl2 - AiHPfw+x4rNv5+/Xq//88sz/8dWl/+/Om//46sb///rX///51/+xv5frimQv0/f39/8aGkaPAACfR/// - /wH///8B2YIDIduDA5ninDfP7MSH6/LVpvny2bL//PHN+fbcpevmpkXP24MDmZVqLUE4OG99gID//wEB - scH///8B////Af///wHhhwMJ5YoDReaLA4vmiwOt5osDu+aLA63miwOL5YoDReGHAwn///8BKyudOQEB - 3q8BAcZBAAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA - //8AAP//AAD//w== - - \ No newline at end of file Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapChangeCoordinateSystemCommand.cs =================================================================== diff -u -r80d33e42292f20775a8230ba6d14e357a002e4ae -r37b92ac1ba7a5d381aedd8e287443450e0c2d7aa --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapChangeCoordinateSystemCommand.cs (.../MapChangeCoordinateSystemCommand.cs) (revision 80d33e42292f20775a8230ba6d14e357a002e4ae) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapChangeCoordinateSystemCommand.cs (.../MapChangeCoordinateSystemCommand.cs) (revision 37b92ac1ba7a5d381aedd8e287443450e0c2d7aa) @@ -21,7 +21,7 @@ { var activeView = SharpMapGisGuiPlugin.GetFocusedMapView(); - var selectCoordinateSystemDialog = new SelectCoordinateSystemDialog(OgrCoordinateSystemFactory.SupportedCoordinateSystems, GIS.SharpMap.Map.Map.CoordinateSystemFactory.CustomCoordinateSystems); + var selectCoordinateSystemDialog = new SelectCoordinateSystemDialog(Gui.MainWindow, OgrCoordinateSystemFactory.SupportedCoordinateSystems, GIS.SharpMap.Map.Map.CoordinateSystemFactory.CustomCoordinateSystems); if (selectCoordinateSystemDialog.ShowDialog(Gui.MainWindow) == DialogResult.OK) { Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/CoordinateSystemTypeEditor.cs =================================================================== diff -u -ra772c49f0c4e64a606d832165c4f55f617a6e663 -r37b92ac1ba7a5d381aedd8e287443450e0c2d7aa --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/CoordinateSystemTypeEditor.cs (.../CoordinateSystemTypeEditor.cs) (revision a772c49f0c4e64a606d832165c4f55f617a6e663) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/CoordinateSystemTypeEditor.cs (.../CoordinateSystemTypeEditor.cs) (revision 37b92ac1ba7a5d381aedd8e287443450e0c2d7aa) @@ -3,6 +3,7 @@ using System.ComponentModel; using System.Drawing.Design; using System.Windows.Forms; +using Core.Common.Utils.PropertyBag.Dynamic; using Core.GIS.GeoAPI.CoordinateSystems; using Core.GIS.SharpMap.Map; using Core.GIS.SharpMap.UI.Forms; @@ -19,13 +20,25 @@ [RefreshProperties(RefreshProperties.All)] public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, object value) { - if (context == null || provider == null || context.Instance == null || context.Instance is MapProperties) + if (context == null || provider == null) { - return EditValue(provider, value); + return base.EditValue(provider, value); } - var selectCoordinateSystemDialog = new SelectCoordinateSystemDialog(new List(Map.CoordinateSystemFactory.SupportedCoordinateSystems), Map.CoordinateSystemFactory.CustomCoordinateSystems); + var dynamicPropertyBag = context.Instance as DynamicPropertyBag; + if (dynamicPropertyBag == null) + { + return base.EditValue(provider, value); + } + var mapProperties = dynamicPropertyBag.WrappedObject as MapProperties; + if (mapProperties == null) + { + return base.EditValue(provider, value); + } + + var selectCoordinateSystemDialog = new SelectCoordinateSystemDialog(mapProperties.Owner, new List(Map.CoordinateSystemFactory.SupportedCoordinateSystems), Map.CoordinateSystemFactory.CustomCoordinateSystems); + if (selectCoordinateSystemDialog.ShowDialog() == DialogResult.OK) { return selectCoordinateSystemDialog.SelectedCoordinateSystem;