[MonoDevelop] managed dock

[John Luke]

--=-8i/lsJDWOBKmLKSlJJO7
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Hey all,

Just an update I had forgotten to update the Makefile, and a slightly
update patch is attached. Same instructions.	

To try it out:
cd MonoDevelop/Unused/Gdl/
make
cd MonoDevelop/Core/src/MonoDevelop.Base
make clean
patch -p0 < dock.patch
make
cd MonoDevelop/build/bin
mono MonoDevelop.exe



--=-8i/lsJDWOBKmLKSlJJO7
Content-Disposition: attachment; filename=dock.patch
Content-Type: text/x-patch; name=dock.patch; charset=utf-8
Content-Transfer-Encoding: 7bit

Index: Gui/Workbench/Layouts/SdiWorkspaceLayout.cs
===================================================================
--- Gui/Workbench/Layouts/SdiWorkspaceLayout.cs	(revision 2288)
+++ Gui/Workbench/Layouts/SdiWorkspaceLayout.cs	(working copy)
@@ -83,7 +83,7 @@
 			
 			// Create the docking widget and add it to the window.
 			dock = new Dock ();
-			DockBar dockBar = new DockBar (dock);
+			DockBar dockBar = dock.Master.DockBar;
 			Gtk.HBox dockBox = new HBox (false, 5);
 			dockBox.PackStart (dockBar, false, true, 0);
 			dockBox.PackStart (dock, true, true, 0);
@@ -345,7 +345,7 @@
 								 content.Icon,
 								 DockItemBehavior.Normal);
 								 
-			Gtk.Label label = item.Tablabel as Gtk.Label;
+			Gtk.Label label = item.TabLabel as Gtk.Label;
 			label.UseMarkup = true;
 
 			item.Add (content.Control);
@@ -356,11 +356,11 @@
 			if (extraPad) {
 				DockItem ot = dock.GetItemByName ("MonoDevelop.Gui.Pads.OpenTaskView"); 
 				if (ot != null && ot.IsAttached) {
-					item.DockTo (ot, DockPlacement.Center, 0);
+					item.DockTo (ot, DockPlacement.Center);
 				}
 				else {
 					ot = dock.GetItemByName ("Documents"); 
-					item.DockTo (ot, DockPlacement.Bottom, 0);
+					item.DockTo (ot, DockPlacement.Bottom);
 				}
 			}
 			else
@@ -375,7 +375,7 @@
 			IPadContent content = (IPadContent) source;
 			DockItem item = GetDockItem (content);
 			if (item != null) {
-				Gtk.Label label = item.Tablabel as Gtk.Label;
+				Gtk.Label label = item.TabLabel as Gtk.Label;
 				label.Markup = content.Title;
 				item.LongName = content.Title;
 				item.StockId = content.Icon;
Index: Makefile.am
===================================================================
--- Makefile.am	(revision 2288)
+++ Makefile.am	(working copy)
@@ -6,7 +6,7 @@
 	/r:$(top_builddir)/build/bin/MonoDevelop.Gui.Utils.dll \
 	/r:$(top_builddir)/build/bin/MonoDevelop.Gui.Widgets.dll \
 	/r:System.Data.dll /r:System.Web.Services.dll \
-	/r:$(top_builddir)/build/bin/gdl-sharp.dll \
+	/r:$(top_builddir)/build/bin/MonoDevelop.Dock.dll \
 	/r:Mono.Posix.dll \
 	$(GTK_SHARP_LIBS) \
 	$(GNOME_SHARP_LIBS) \

--=-8i/lsJDWOBKmLKSlJJO7--