# HG changeset patch
# User wycc
# Date 1289753598 -28800
# Node ID 82321f404b5f760f58acd6783bc6732d30e428ef
# Parent  a3f2fbf791918f8deb7b182b30d6c2a1e2458425
Change the implement to insert window into the toplevel of the spdesktop. However, we not not insert the scene editor after the aloat window since they are created latter.

diff -r a3f2fbf79191 -r 82321f404b5f pyink/MBScene.py
--- a/pyink/MBScene.py	Sun Nov 14 23:10:00 2010 +0800
+++ b/pyink/MBScene.py	Mon Nov 15 00:53:18 2010 +0800
@@ -411,6 +411,7 @@
 		self.scrollwin = gtk.ScrolledWindow()
 		self.scrollwin.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
 		self.scrollwin.add_with_viewport(self.grid)
+		self.scrollwin.set_size_request(-1,150)
 		for i in range(1,max):
 			self.grid.attach(gtk.Label('%d'% i), i,i+1,0,1,0,0,0,0)
 		for i in range(1,len(self.layer)+1):
@@ -468,16 +469,16 @@
 	def addButtons(self,hbox):
 		btn = gtk.Button('Edit')
 		btn.connect('clicked', self.doEditScene)
-		hbox.pack_start(btn)
+		hbox.pack_start(btn,expand=False,fill=False)
 		btn = gtk.Button('Insert Key')
 		btn.connect('clicked',self.doInsertKeyScene)
-		hbox.pack_start(btn)
+		hbox.pack_start(btn,expand=False,fill=False)
 		btn=gtk.Button('Remove Key')
 		btn.connect('clicked', self.doRemoveScene)
-		hbox.pack_start(btn)
+		hbox.pack_start(btn,expand=False,fill=False)
 		btn=gtk.Button('Extend scene')
 		btn.connect('clicked', self.doExtendScene)
-		hbox.pack_start(btn)
+		hbox.pack_start(btn,expand=False,fill=False)
 	def onQuit(self, event):
 		self.OK = False
 		gtk.main_quit()
@@ -487,16 +488,16 @@
 
 	def onConfirmDelete(self):
 		if self.scenemap == None:
-			vbox = gtk.VBox()
+			vbox = gtk.VBox(False,0)
 			vbox.pack_start(gtk.Label('Convert the SVG into a MadButterfly SVG file. All current element will be delted'))
-			hbox = gtk.HBox()
+			hbox = gtk.HBox(False,0)
 			self.button = gtk.Button('OK')
-			hbox.pack_start(self.button)
+			hbox.pack_start(self.button,expand=False,fill=False)
 			self.button.connect('clicked', self.onOK)
 			self.button = gtk.Button('Cancel')
-			hbox.pack_start(self.button)
+			hbox.pack_start(self.button,expand=False,fill=False)
 			self.button.connect("clicked", self.onQuit)
-			vbox.pack_start(hbox)
+			vbox.pack_start(hbox,expand=False,fill=False)
 			self.window.add(vbox)
 			self.window.show_all()
 			gtk.main()
@@ -507,23 +508,26 @@
 		self.OK = True
 		self.parseScene()
 		self.showGrid()
+		vbox = gtk.VBox(False,0)
+		self.desktop.getToplevel().child.child.pack_end(vbox,expand=False)
+		self.window = vbox
 		#self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
 		#self.window.connect("destroy", gtk.main_quit)
 		#self.window.set_position(gtk.WIN_POS_MOUSE)
 		if self.scenemap == None:
 			self.onConfirmDelete()
 		if self.OK:
-			vbox = gtk.VBox()
-			self.window.add(vbox)
-			vbox.add(self.scrollwin)
+			vbox = gtk.VBox(False,0)
+			self.window.pack_start(vbox,expand=False)
+			vbox.pack_start(self.scrollwin,expand=False)
 			self.vbox = vbox
-			hbox=gtk.HBox()
+			hbox=gtk.HBox(False,0)
 			self.addButtons(hbox)
-			vbox.add(hbox)
+			vbox.pack_start(hbox,expand=False)
 		else:
 			return
 
-		self.window.set_size_request(600,200)
+		#self.window.set_size_request(600,200)
 
 		self.window.show_all()
 
diff -r a3f2fbf79191 -r 82321f404b5f pyink/pyink.py
--- a/pyink/pyink.py	Sun Nov 14 23:10:00 2010 +0800
+++ b/pyink/pyink.py	Mon Nov 15 00:53:18 2010 +0800
@@ -7,16 +7,16 @@
 def start_desktop(inkscape,ptr):
     global ink_inited
     if ink_inited == 1:
+    	desktop = pybInkscape.GPointer_2_PYSPDesktop(ptr)
+	top = desktop.getToplevel()
+    	#dock = desktop.getDock()
+    	#item = dock.new_item("scene", "scene", "feBlend-icon", dock.ITEM_ST_DOCKED_STATE)
+    	scene = MBScene(desktop,top)
+    	scene.show()
         return
         
-    desktop = pybInkscape.GPointer_2_PYSPDesktop(ptr)
-    top = desktop.getToplevel()
-    dock = desktop.getDock()
-    item = dock.new_item("scene", "scene", "feBlend-icon", dock.ITEM_ST_DOCKED_STATE)
 
     ink_inited = 1
-    scene = MBScene(desktop,item.get_vbox())
-    scene.show()
 
 
 def pyink_start():