Fixed serialization issues with the StepLabelContainer and the SpeechbubbleContainer, they should now be in the correct shape/location when loading from the .greenshot file.

Greenshot/Drawing/SpeechbubbleContainer.cs

@@ -27,6 +27,7 @@ using System;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Drawing.Text;
+using System.Runtime.Serialization;
 using System.Windows.Forms;
 
 namespace Greenshot.Drawing {
@@ -35,7 +36,34 @@ namespace Greenshot.Drawing {
 	/// </summary>
 	[Serializable]
 	public class SpeechbubbleContainer : TextContainer {
-		public SpeechbubbleContainer(Surface parent) : base(parent) {
+
+		#region TargetGripper serializing code
+		// Only used for serializing the TargetGripper location
+		private Point _storedTargetGripperLocation;
+
+		/// <summary>
+		/// Store the current location of the target gripper
+		/// </summary>
+		/// <param name="context"></param>
+		[OnSerializing]
+		private void SetValuesOnSerializing(StreamingContext context) {
+			if (TargetGripper != null) {
+				_storedTargetGripperLocation = TargetGripper.Location;
+			}
+		}
+
+		/// <summary>
+		/// Restore the target gripper
+		/// </summary>
+		/// <param name="context"></param>
+		[OnDeserialized]
+		private void SetValuesOnDeserialized(StreamingContext context) {
+			InitTargetGripper(Color.Green, _storedTargetGripperLocation);
+		}
+		#endregion
+
+		public SpeechbubbleContainer(Surface parent)
+			: base(parent) {
 		}
 
 		/// <summary>

Greenshot/Drawing/StepLabelContainer.cs

@@ -1,160 +1,187 @@
-/*
+/*
- * Greenshot - a free and open source screenshot tool
+ * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2012  Thomas Braun, Jens Klingen, Robin Krom
+ * Copyright (C) 2007-2012  Thomas Braun, Jens Klingen, Robin Krom
- * 
+ * 
- * For more information see: http://getgreenshot.org/
+ * For more information see: http://getgreenshot.org/
- * The Greenshot project is hosted on Sourceforge: http://sourceforge.net/projects/greenshot/
+ * The Greenshot project is hosted on Sourceforge: http://sourceforge.net/projects/greenshot/
- * 
+ * 
- * This program is free software: you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 1 of the License, or
+ * the Free Software Foundation, either version 1 of the License, or
- * (at your option) any later version.
+ * (at your option) any later version.
- * 
+ * 
- * This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU General Public License for more details.
- * 
+ * 
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+ */
-
+
-using Greenshot.Drawing.Fields;
+using Greenshot.Drawing.Fields;
-using Greenshot.Helpers;
+using Greenshot.Helpers;
-using Greenshot.Plugin;
+using Greenshot.Plugin;
-using Greenshot.Plugin.Drawing;
+using Greenshot.Plugin.Drawing;
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Drawing;
+using System.Drawing;
-using System.Drawing.Drawing2D;
+using System.Drawing.Drawing2D;
-using System.Drawing.Text;
+using System.Drawing.Text;
-using System.Runtime.Serialization;
+using System.Runtime.Serialization;
-
+
-namespace Greenshot.Drawing {
+namespace Greenshot.Drawing {
-	/// <summary>
+	/// <summary>
-	/// Description of StepLabelContainer.
+	/// Description of StepLabelContainer.
-	/// This is an enumerated label, every single StepLabelContainer shows the number of the order it was created.
+	/// This is an enumerated label, every single StepLabelContainer shows the number of the order it was created.
-	/// To make sure that deleting recalculates, we check the location before every draw.
+	/// To make sure that deleting recalculates, we check the location before every draw.
-	/// </summary>
+	/// </summary>
-	[Serializable]
+	[Serializable]
-	public class StepLabelContainer : DrawableContainer {
+	public class StepLabelContainer : DrawableContainer {
-		[NonSerialized]
+		[NonSerialized]
-		private StringFormat _stringFormat = new StringFormat();
+		private StringFormat _stringFormat = new StringFormat();
-
+
-		private readonly bool _drawAsRectangle = false;
+		private readonly bool _drawAsRectangle = false;
-
+
-		public StepLabelContainer(Surface parent) : base(parent) {
+		public StepLabelContainer(Surface parent) : base(parent) {
-			parent.AddStepLabel(this);
+			parent.AddStepLabel(this);
-			InitContent();
+			InitContent();
-		}
+		}
-
+
-		[OnDeserialized]
+		#region Number serializing
-		private void OnDeserialized(StreamingContext context) {
+		// Used to store the number of this label, so when deserializing it can be placed back to the StepLabels list in the right location
-			_stringFormat = new StringFormat();
+		private int _number;
-			_stringFormat.Alignment = StringAlignment.Center;
+		public int Number {
-			_stringFormat.LineAlignment = StringAlignment.Center;
+			get {
+				return _number;
+			}
+			set {
+				_number = value;
+			}
 		}
 
 		/// <summary>
-		/// Make sure the StepLabel is addded to the parent after deserializing
+		/// Retrieve the counter before serializing
-		/// by removing it from the current parent and added it to the new
+		/// </summary>
+		/// <param name="context"></param>
+		[OnSerializing]
+		private void SetValuesOnSerializing(StreamingContext context) {
+			if (Parent != null) {
+				Number = ((Surface)Parent).CountStepLabels(this);
+			}
+		}
+		#endregion
+
+		/// <summary>
+		/// Restore values that don't serialize
+		/// </summary>
+		/// <param name="context"></param>
+		[OnDeserialized]
+		private void SetValuesOnDeserialized(StreamingContext context) {
+			_stringFormat = new StringFormat();
+			_stringFormat.Alignment = StringAlignment.Center;
+			_stringFormat.LineAlignment = StringAlignment.Center;
+		}
+
+		/// <summary>
+		/// Add the StepLabel to the parent
 		/// </summary>
 		/// <param name="newParent"></param>
 		protected override void SwitchParent(Surface newParent) {
 			if (Parent != null) {
-				Parent.RemoveStepLabel(this);
+				((Surface)Parent).RemoveStepLabel(this);
 			}
 			base.SwitchParent(newParent);
-			if (Parent != null) {
+			if (newParent != null) {
-				Parent.AddStepLabel(this);
+				((Surface)Parent).AddStepLabel(this);
 			}
 		}
 
-		public override Size DefaultSize {
+		public override Size DefaultSize {
-			get {
+			get {
-				return new Size(30, 30);
+				return new Size(30, 30);
-			}
+			}
-		}
+		}
-
+
-		public override bool InitContent() {
+		public override bool InitContent() {
-			_defaultEditMode = EditStatus.IDLE;
+			_defaultEditMode = EditStatus.IDLE;
-			_stringFormat.Alignment = StringAlignment.Center;
+			_stringFormat.Alignment = StringAlignment.Center;
-			_stringFormat.LineAlignment = StringAlignment.Center;
+			_stringFormat.LineAlignment = StringAlignment.Center;
-
+
-			// Set defaults
+			// Set defaults
-			Width = DefaultSize.Width;
+			Width = DefaultSize.Width;
-			Height = DefaultSize.Height;
+			Height = DefaultSize.Height;
-
+
-			return true;
+			return true;
-		}
+		}
-
+
-		/// <summary>
+		/// <summary>
-		/// This makes it possible for the label to be placed exactly in the middle of the pointer.
+		/// This makes it possible for the label to be placed exactly in the middle of the pointer.
-		/// </summary>
+		/// </summary>
-		public override bool HandleMouseDown(int mouseX, int mouseY) {
+		public override bool HandleMouseDown(int mouseX, int mouseY) {
-			return base.HandleMouseDown(mouseX - (Width / 2), mouseY - (Height / 2));
+			return base.HandleMouseDown(mouseX - (Width / 2), mouseY - (Height / 2));
-		}
+		}
-
+
-		/// <summary>
+		/// <summary>
-		/// We set our own field values
+		/// We set our own field values
-		/// </summary>
+		/// </summary>
-		protected override void InitializeFields() {
+		protected override void InitializeFields() {
-			AddField(GetType(), FieldType.FILL_COLOR, Color.DarkRed);
+			AddField(GetType(), FieldType.FILL_COLOR, Color.DarkRed);
-			AddField(GetType(), FieldType.LINE_COLOR, Color.White);
+			AddField(GetType(), FieldType.LINE_COLOR, Color.White);
-		}
+		}
-
+
-		/// <summary>
+		/// <summary>
-		/// Make sure this element is no longer referenced from the surface
+		/// Make sure this element is no longer referenced from the surface
-		/// </summary>
+		/// </summary>
-		public override void Dispose() {
+		public override void Dispose() {
-			Parent.RemoveStepLabel(this);
+			((Surface)Parent).RemoveStepLabel(this);
-			base.Dispose();
+			base.Dispose();
-		}
+		}
-
+
-		public override bool HandleMouseMove(int x, int y) {
+		public override bool HandleMouseMove(int x, int y) {
-			Invalidate();
+			Invalidate();
-			Left = x - (Width / 2);
+			Left = x - (Width / 2);
-			Top = y - (Height / 2);
+			Top = y - (Height / 2);
-			Invalidate();
+			Invalidate();
-			return true;
+			return true;
-		}
+		}
-
+
-		/// <summary>
+		/// <summary>
-		/// Override the parent, calculate the label number, than draw
+		/// Override the parent, calculate the label number, than draw
-		/// </summary>
+		/// </summary>
-		/// <param name="graphics"></param>
+		/// <param name="graphics"></param>
-		/// <param name="rm"></param>
+		/// <param name="rm"></param>
-		public override void Draw(Graphics graphics, RenderMode rm) {
+		public override void Draw(Graphics graphics, RenderMode rm) {
-			graphics.SmoothingMode = SmoothingMode.HighQuality;
+			graphics.SmoothingMode = SmoothingMode.HighQuality;
-			graphics.InterpolationMode = InterpolationMode.HighQualityBicubic;
+			graphics.InterpolationMode = InterpolationMode.HighQualityBicubic;
-			graphics.CompositingQuality = CompositingQuality.HighQuality;
+			graphics.CompositingQuality = CompositingQuality.HighQuality;
-			graphics.PixelOffsetMode = PixelOffsetMode.None;
+			graphics.PixelOffsetMode = PixelOffsetMode.None;
-			graphics.TextRenderingHint = TextRenderingHint.AntiAliasGridFit;
+			graphics.TextRenderingHint = TextRenderingHint.AntiAliasGridFit;
-			string text = Parent.CountStepLabels(this).ToString();
+			string text = ((Surface)Parent).CountStepLabels(this).ToString();
-			Rectangle rect = GuiRectangle.GetGuiRectangle(Left, Top, Width, Height);
+			Rectangle rect = GuiRectangle.GetGuiRectangle(Left, Top, Width, Height);
-			Color fillColor = GetFieldValueAsColor(FieldType.FILL_COLOR);
+			Color fillColor = GetFieldValueAsColor(FieldType.FILL_COLOR);
-			Color lineColor = GetFieldValueAsColor(FieldType.LINE_COLOR);
+			Color lineColor = GetFieldValueAsColor(FieldType.LINE_COLOR);
-			if (_drawAsRectangle) {
+			if (_drawAsRectangle) {
-				RectangleContainer.DrawRectangle(rect, graphics, rm, 0, Color.Transparent, fillColor, false);
+				RectangleContainer.DrawRectangle(rect, graphics, rm, 0, Color.Transparent, fillColor, false);
-			} else {
+			} else {
-				EllipseContainer.DrawEllipse(rect, graphics, rm, 0, Color.Transparent, fillColor, false);
+				EllipseContainer.DrawEllipse(rect, graphics, rm, 0, Color.Transparent, fillColor, false);
-			}
+			}
-			using (FontFamily fam = new FontFamily(FontFamily.GenericSansSerif.Name)) {
+			using (FontFamily fam = new FontFamily(FontFamily.GenericSansSerif.Name)) {
-				float factor = (((float)rect.Width / DefaultSize.Width) + ((float)rect.Height / DefaultSize.Height)) / 2;
+				float factor = (((float)rect.Width / DefaultSize.Width) + ((float)rect.Height / DefaultSize.Height)) / 2;
-				using (Font _font = new Font(fam, 16 * factor, FontStyle.Bold, GraphicsUnit.Pixel)) {
+				using (Font _font = new Font(fam, 16 * factor, FontStyle.Bold, GraphicsUnit.Pixel)) {
-					TextContainer.DrawText(graphics, rect, 0, lineColor, false, _stringFormat, text, _font);
+					TextContainer.DrawText(graphics, rect, 0, lineColor, false, _stringFormat, text, _font);
-				}
+				}
-			}
+			}
-		}
+		}
-
+
-		public override bool ClickableAt(int x, int y) {
+		public override bool ClickableAt(int x, int y) {
-			Rectangle rect = GuiRectangle.GetGuiRectangle(Left, Top, Width, Height);
+			Rectangle rect = GuiRectangle.GetGuiRectangle(Left, Top, Width, Height);
-			Color fillColor = GetFieldValueAsColor(FieldType.FILL_COLOR);
+			Color fillColor = GetFieldValueAsColor(FieldType.FILL_COLOR);
-			if (_drawAsRectangle) {
+			if (_drawAsRectangle) {
-				return RectangleContainer.RectangleClickableAt(rect, 0, fillColor, x, y);
+				return RectangleContainer.RectangleClickableAt(rect, 0, fillColor, x, y);
-			} else {
+			} else {
-				return EllipseContainer.EllipseClickableAt(rect, 0, fillColor, x, y);
+				return EllipseContainer.EllipseClickableAt(rect, 0, fillColor, x, y);
-			}
+			}
-		}
+		}
-	}
+	}
-}
+}

Greenshot/Drawing/Surface.cs

@@ -208,24 +208,23 @@ namespace Greenshot.Drawing {
 		/// <summary>
 		/// all stepLabels for the surface, needed with serialization
 		/// </summary>
-		private List<IDrawableContainer> _stepLabels = new List<IDrawableContainer>();
+		private List<StepLabelContainer> _stepLabels = new List<StepLabelContainer>();
 
-		public void AddStepLabel(IDrawableContainer stepLabel) {
+		public void AddStepLabel(StepLabelContainer stepLabel) {
 			_stepLabels.Add(stepLabel);
 		}
-		public void RemoveStepLabel(IDrawableContainer stepLabel) {
+		public void RemoveStepLabel(StepLabelContainer stepLabel) {
 			_stepLabels.Remove(stepLabel);
 		}
 
 		/// <summary>
-		/// Count all the steplabels in the surface, up to the supplied one
+		/// Count all the VISIBLE steplabels in the surface, up to the supplied one
 		/// </summary>
 		/// <param name="stopAtContainer">can be null, if not the counting stops here</param>
 		/// <returns>number of steplabels before the supplied container</returns>
 		public int CountStepLabels(IDrawableContainer stopAtContainer) {
 			int number = 1;
-			foreach (var drawableContainer in _stepLabels) {
+			foreach (var possibleThis in _stepLabels) {
-				var possibleThis = (StepLabelContainer) drawableContainer;
 				if (possibleThis == stopAtContainer) {
 					break;
 				}
@@ -631,6 +630,10 @@ namespace Greenshot.Drawing {
 				BinaryFormatter binaryRead = new BinaryFormatter();
 				DrawableContainerList loadedElements = (DrawableContainerList) binaryRead.Deserialize(streamRead);
 				loadedElements.Parent = this;
+				// Make sure the steplabels are sorted accoring to their number
+				_stepLabels.Sort(delegate(StepLabelContainer p1, StepLabelContainer p2) {
+					return p1.Number.CompareTo(p2.Number);
+				});
 				DeselectAllElements();
 				AddElements(loadedElements);
 				SelectElements(loadedElements);

GreenshotPlugin/Interfaces/Generic.cs

@@ -198,9 +198,5 @@ namespace Greenshot.Plugin {
 			get;
 			set;
 		}
-
-		void AddStepLabel(IDrawableContainer stepLabel);
-		void RemoveStepLabel(IDrawableContainer stepLabel);
-		int CountStepLabels(IDrawableContainer stopCountingOnStepLabel);
 	}
 }