X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=MainControlWindow.py;h=0a24f4cfc9efa2894f157a75342caf880c935a1a;hb=d5dc6369fca636f78c76f0f95aefb9817289e27f;hp=d82baaf760ebe069695b14c5b5833fb5cd7c2dd0;hpb=0024f43ac5834f611179587a6fc25385ee5bf4a5;p=pygdb.git

diff --git a/MainControlWindow.py b/MainControlWindow.py
old mode 100755
new mode 100644
index d82baaf..0a24f4c
--- a/MainControlWindow.py
+++ b/MainControlWindow.py
@@ -32,37 +32,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,20 +120,3 @@ class MainControlWindow (gtk.Window):
 			cb(pos)
 
 
-
-
-if __name__ == "__main__":
-
-	def newpos(pos):
-		print "new pos: ", pos
-
-
-	clientCmd = string.join(sys.argv[1:])
-	dbgterm = GdbTerminal.GdbTerminal(clientCmd)
-	mainCtrlWnd = MainControlWindow(dbgterm)
-
-	mainCtrlWnd.newPosCbs += [newpos]
-
-	gtk.main()
-
-