Index: Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.Designer.cs =================================================================== diff -u -r3732fd8049fe829894945e2b7bd74143454b8218 -rf3d39e01874c99004027cc77af2c05843924d539 --- Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.Designer.cs (.../MapControl.Designer.cs) (revision 3732fd8049fe829894945e2b7bd74143454b8218) +++ Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.Designer.cs (.../MapControl.Designer.cs) (revision f3d39e01874c99004027cc77af2c05843924d539) @@ -53,6 +53,7 @@ this.toolStrip.CanOverflow = false; this.toolStrip.Dock = System.Windows.Forms.DockStyle.Right; this.toolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; + this.toolStrip.ImageScalingSize = new System.Drawing.Size(32, 32); this.toolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.panToolStripButton, this.zoomToRectangleToolStripButton, @@ -69,51 +70,51 @@ // panToolStripButton // this.panToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.panToolStripButton.Image = global::Core.Components.DotSpatial.Forms.Properties.Resources.MapPanZoomImage; + this.panToolStripButton.Image = global::Core.Components.DotSpatial.Forms.Properties.Resources.Pan; this.panToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.panToolStripButton.Margin = new System.Windows.Forms.Padding(2, 2, 0, 3); this.panToolStripButton.Name = "panToolStripButton"; - this.panToolStripButton.Size = new System.Drawing.Size(41, 20); + this.panToolStripButton.Size = new System.Drawing.Size(41, 28); this.panToolStripButton.Click += new System.EventHandler(this.PanToolStripButtonClick); // // zoomToRectangleToolStripButton // this.zoomToRectangleToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.zoomToRectangleToolStripButton.Image = global::Core.Components.DotSpatial.Forms.Properties.Resources.zoomrectangle; + this.zoomToRectangleToolStripButton.Image = global::Core.Components.DotSpatial.Forms.Properties.Resources.ZoomToRectangle; this.zoomToRectangleToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.zoomToRectangleToolStripButton.Margin = new System.Windows.Forms.Padding(2, 2, 0, 3); this.zoomToRectangleToolStripButton.Name = "zoomToRectangleToolStripButton"; - this.zoomToRectangleToolStripButton.Size = new System.Drawing.Size(41, 20); + this.zoomToRectangleToolStripButton.Size = new System.Drawing.Size(41, 28); this.zoomToRectangleToolStripButton.Click += new System.EventHandler(this.ZoomToRectangleToolStripButtonClick); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(31, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(43, 6); // // zoomToAllVisibleLayersToolStripButton // this.zoomToAllVisibleLayersToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.zoomToAllVisibleLayersToolStripButton.Image = global::Core.Components.DotSpatial.Forms.Properties.Resources.zoomextents; + this.zoomToAllVisibleLayersToolStripButton.Image = global::Core.Components.DotSpatial.Forms.Properties.Resources.ZoomToExtents; this.zoomToAllVisibleLayersToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.zoomToAllVisibleLayersToolStripButton.Margin = new System.Windows.Forms.Padding(2, 2, 0, 3); this.zoomToAllVisibleLayersToolStripButton.Name = "zoomToAllVisibleLayersToolStripButton"; - this.zoomToAllVisibleLayersToolStripButton.Size = new System.Drawing.Size(41, 20); + this.zoomToAllVisibleLayersToolStripButton.Size = new System.Drawing.Size(41, 28); this.zoomToAllVisibleLayersToolStripButton.Click += new System.EventHandler(this.ZoomToAllVisibleLayersToolStripButtonClick); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(31, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(43, 6); // // showCoordinatesToolStripButton // this.showCoordinatesToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.showCoordinatesToolStripButton.Image = global::Core.Components.DotSpatial.Forms.Properties.Resources.map_pin; + this.showCoordinatesToolStripButton.Image = global::Core.Components.DotSpatial.Forms.Properties.Resources.ShowCoordinates; this.showCoordinatesToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.showCoordinatesToolStripButton.Margin = new System.Windows.Forms.Padding(2, 2, 0, 3); this.showCoordinatesToolStripButton.Name = "showCoordinatesToolStripButton"; - this.showCoordinatesToolStripButton.Size = new System.Drawing.Size(41, 20); + this.showCoordinatesToolStripButton.Size = new System.Drawing.Size(41, 28); this.showCoordinatesToolStripButton.Click += new System.EventHandler(this.ShowCoordinatesToolStripButtonClick); // // MapControl Index: Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.resx =================================================================== diff -u -r3732fd8049fe829894945e2b7bd74143454b8218 -rf3d39e01874c99004027cc77af2c05843924d539 --- Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.resx (.../MapControl.resx) (revision 3732fd8049fe829894945e2b7bd74143454b8218) +++ Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.resx (.../MapControl.resx) (revision f3d39e01874c99004027cc77af2c05843924d539) @@ -120,7 +120,4 @@ 17, 17 - - True - \ No newline at end of file Index: Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rb16dadaa41c7f66c4948627472c6595155acf538 -rf3d39e01874c99004027cc77af2c05843924d539 --- Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b16dadaa41c7f66c4948627472c6595155acf538) +++ Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f3d39e01874c99004027cc77af2c05843924d539) @@ -114,6 +114,26 @@ /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// + internal static System.Drawing.Bitmap Pan { + get { + object obj = ResourceManager.GetObject("Pan", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ShowCoordinates { + get { + object obj = ResourceManager.GetObject("ShowCoordinates", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap zoomextents { get { object obj = ResourceManager.GetObject("zoomextents", resourceCulture); @@ -130,5 +150,25 @@ return ((System.Drawing.Bitmap)(obj)); } } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ZoomToExtents { + get { + object obj = ResourceManager.GetObject("ZoomToExtents", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ZoomToRectangle { + get { + object obj = ResourceManager.GetObject("ZoomToRectangle", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } Index: Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.resx =================================================================== diff -u -rb16dadaa41c7f66c4948627472c6595155acf538 -rf3d39e01874c99004027cc77af2c05843924d539 --- Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.resx (.../Resources.resx) (revision b16dadaa41c7f66c4948627472c6595155acf538) +++ Core/Components/src/Core.Components.DotSpatial.Forms/Properties/Resources.resx (.../Resources.resx) (revision f3d39e01874c99004027cc77af2c05843924d539) @@ -127,10 +127,22 @@ ..\Resources\map-pin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Pan.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ShowCoordinates.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\zoomextents.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\zoomrectangle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ZoomToExtents.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ZoomToRectangle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file Index: Core/Components/src/Core.Components.DotSpatial.Forms/Resources/Pan.png =================================================================== diff -u Binary files differ Index: Core/Components/src/Core.Components.DotSpatial.Forms/Resources/ShowCoordinates.png =================================================================== diff -u Binary files differ Index: Core/Components/src/Core.Components.DotSpatial.Forms/Resources/ZoomToExtents.png =================================================================== diff -u Binary files differ Index: Core/Components/src/Core.Components.DotSpatial.Forms/Resources/ZoomToRectangle.png =================================================================== diff -u Binary files differ