[Monodevelop-patches-list] r2301 - trunk/MonoDevelop/Unused/Gdl

[John Luke <jluke@cfl.rr.com>]

Author: jluke
Date: 2005-03-06 22:50:42 -0500 (Sun, 06 Mar 2005)
New Revision: 2301

Removed:
   trunk/MonoDevelop/Unused/Gdl/DockParamFlags.cs
Modified:
   trunk/MonoDevelop/Unused/Gdl/DockLayout.cs
   trunk/MonoDevelop/Unused/Gdl/DockNotebook.cs
   trunk/MonoDevelop/Unused/Gdl/DockObject.cs
   trunk/MonoDevelop/Unused/Gdl/DockPaned.cs
   trunk/MonoDevelop/Unused/Gdl/TODO
Log:
remove unneeded DockParamFlags
and implement after property loading


Modified: trunk/MonoDevelop/Unused/Gdl/DockLayout.cs
===================================================================
--- trunk/MonoDevelop/Unused/Gdl/DockLayout.cs	2005-03-07 03:24:57 UTC (rev 2300)
+++ trunk/MonoDevelop/Unused/Gdl/DockLayout.cs	2005-03-07 03:50:42 UTC (rev 2301)
@@ -462,7 +462,8 @@
 					if (obj is DockPlaceholder)
 						obj.Detach (false);
 
-					// FIXME: apply "after" parameters
+					// apply "after" parameters
+					obj.FromXmlAfter (node);
 
 					// add the object to the parent
 					if (parent != null) {

Modified: trunk/MonoDevelop/Unused/Gdl/DockNotebook.cs
===================================================================
--- trunk/MonoDevelop/Unused/Gdl/DockNotebook.cs	2005-03-07 03:24:57 UTC (rev 2300)
+++ trunk/MonoDevelop/Unused/Gdl/DockNotebook.cs	2005-03-07 03:50:42 UTC (rev 2301)
@@ -99,10 +99,12 @@
 			this.Orientation = orientation == "vertical" ? Orientation.Vertical : Orientation.Horizontal;
 			string locked = node.Attributes["locked"].Value;
 			this.Locked = locked == "no" ? false : true;
-			string page = node.Attributes["page"].Value;
-			// FIXME: after property?
-			this.Page = int.Parse (page);
 		}
+
+		public override void FromXmlAfter (XmlNode node)
+		{
+			this.Page = int.Parse (node.Attributes["page"].Value);
+		}
 		
 		public override void OnDocked (DockObject requestor, DockPlacement position, object data)
 		{

Modified: trunk/MonoDevelop/Unused/Gdl/DockObject.cs
===================================================================
--- trunk/MonoDevelop/Unused/Gdl/DockObject.cs	2005-03-07 03:24:57 UTC (rev 2300)
+++ trunk/MonoDevelop/Unused/Gdl/DockObject.cs	2005-03-07 03:50:42 UTC (rev 2301)
@@ -132,9 +132,12 @@
 
 		public virtual void FromXml (XmlNode node)
 		{
-			Console.WriteLine ("override this: {0}", this.GetType ());
 		}
 
+		public virtual void FromXmlAfter (XmlNode node)
+		{
+		}
+
 		protected override void OnDestroyed ()
 		{
 			if (IsCompound) {

Modified: trunk/MonoDevelop/Unused/Gdl/DockPaned.cs
===================================================================
--- trunk/MonoDevelop/Unused/Gdl/DockPaned.cs	2005-03-07 03:24:57 UTC (rev 2300)
+++ trunk/MonoDevelop/Unused/Gdl/DockPaned.cs	2005-03-07 03:50:42 UTC (rev 2301)
@@ -77,9 +77,13 @@
 			CreateChild (this.Orientation);
 			string locked = node.Attributes["locked"].Value;
 			this.Locked = locked == "no" ? false : true;
-			string position = node.Attributes["position"].Value;
-			this.Position = int.Parse (position);
 		}
+
+		public override void FromXmlAfter (XmlNode node)
+		{
+			// FIXME: still dont work
+			this.Position = int.Parse (node.Attributes["position"].Value);
+		}
 		
 		protected override void OnAdded (Widget widget)
 		{

Deleted: trunk/MonoDevelop/Unused/Gdl/DockParamFlags.cs
===================================================================
--- trunk/MonoDevelop/Unused/Gdl/DockParamFlags.cs	2005-03-07 03:24:57 UTC (rev 2300)
+++ trunk/MonoDevelop/Unused/Gdl/DockParamFlags.cs	2005-03-07 03:50:42 UTC (rev 2301)
@@ -1,12 +0,0 @@
-using System;
-
-namespace Gdl
-{
-	[Serializable]
-	[Flags]
-	public enum DockParamFlags
-	{
-		Export = 1,
-		After = 2,
-	}
-}

Modified: trunk/MonoDevelop/Unused/Gdl/TODO
===================================================================
--- trunk/MonoDevelop/Unused/Gdl/TODO	2005-03-07 03:24:57 UTC (rev 2300)
+++ trunk/MonoDevelop/Unused/Gdl/TODO	2005-03-07 03:50:42 UTC (rev 2301)
@@ -2,7 +2,6 @@
  - fix:
 (<unknown>:21016): Gtk-CRITICAL **: gtk_widget_send_expose: assertion `GTK_WIDGET_REALIZED (widget)' failed
  - proper license headers
- - remove DockParamFlags? it looks useless
  - improve de-serialization (also use ExportLayoutAttribute?)
- - "after" properties, ex. restoring Notebook.Page
+ - fix notebook.Position after
  - placeholders in layout store/restore