X-Git-Url: https://git.sthu.org/?p=pygdb.git;a=blobdiff_plain;f=MainControlWindow.py;h=4866134766793687c48d1df1fcc6483c88990d01;hp=55bff28ce698ae6eb83329dccd63da2dd3f36690;hb=1094f7f4581a9c0074294004bbd8c934593a54d5;hpb=e3403072dbc8f31817f6492dea70ebdf5128fcb2

diff --git a/MainControlWindow.py b/MainControlWindow.py
old mode 100755
new mode 100644
index 55bff28..4866134
--- a/MainControlWindow.py
+++ b/MainControlWindow.py
@@ -19,11 +19,12 @@ class MainControlWindow (gtk.Window):
 	#Callbacks for new positions
 	newPosCbs = []
 
-	def __init__(self, dbgterm):
+	def __init__(self, dbgterm, quitonclose=True):
 
 		#Set up GTK stuff
 		gtk.Window.__init__(self)
-		self.connect("destroy", lambda *w: gtk.main_quit())
+		if quitonclose:
+			self.connect("destroy", lambda *w: gtk.main_quit() )
 
 		#Set terminals
 		self.dbgterm = dbgterm
@@ -32,37 +33,29 @@ class MainControlWindow (gtk.Window):
 		#Set title and add terminal
 		self.set_title("Main Control")
 		self.set_border_width(5)
+			
 
+		#Vertical box. Top: Buttons, Bottom: Terminal vpane
+		vbox = gtk.VBox(False,5)
+		self.add(vbox)
 
-		#The main horizontal pane left=buttons, right=terminals
-		hbox = gtk.HBox(False,0)
-		self.add(hbox)
-		hpaned = gtk.HPaned()
-		hbox.pack_start(hpaned, True, True)
-
-
-
-		#Plug together the buttons
-		vbox = gtk.VButtonBox()
-		vbox.set_layout(gtk.BUTTONBOX_START)
-		hpaned.add1(vbox)
+		#Button box
+		hbtnbox = gtk.HButtonBox()
+		hbtnbox.set_layout(gtk.BUTTONBOX_START)
+		vbox.pack_start(hbtnbox)
 
 		self.runBtn = gtk.Button("Run")
-		vbox.add(self.runBtn)
+		hbtnbox.add(self.runBtn)
 		self.continueBtn = gtk.Button("Continue")
-		vbox.add(self.continueBtn)
+		hbtnbox.add(self.continueBtn)
 		self.stepoverBtn = gtk.Button("Step Over")
-		vbox.add(self.stepoverBtn)
+		hbtnbox.add(self.stepoverBtn)
 		self.stepinBtn = gtk.Button("Step In")
-		vbox.add(self.stepinBtn)
+		hbtnbox.add(self.stepinBtn)
 		self.quitBtn = gtk.Button("Quit")
-		vbox.add(self.quitBtn)
-
-
-		#Plug together the terminals
-		vbox = gtk.VBox()
-		hpaned.add2(vbox)
+		hbtnbox.add(self.quitBtn)
 
+		#Vertical pane for terminals
 		vpaned = gtk.VPaned()
 		vbox.pack_start(vpaned, True, True)
 		vpaned.add(self.dbgterm)
@@ -128,21 +121,3 @@ class MainControlWindow (gtk.Window):
 			cb(pos)
 
 
-
-
-if __name__ == "__main__":
-
-
-	import StatusWindow
-
-
-	clientCmd = string.join(sys.argv[1:])
-	dbgterm = GdbTerminal.GdbTerminal(clientCmd)
-	mainCtrlWnd = MainControlWindow(dbgterm)
-
-	statusWnd = StatusWindow.StatusWindow(mainCtrlWnd, dbgterm)
-	mainCtrlWnd.newPosCbs += [statusWnd.updateValues]
-
-	gtk.main()
-
-