reducing font size of terminals; push buttons to top

[pygdb.git] / MainControlWindow.py

diff --git a/MainControlWindow.py b/MainControlWindow.py
index d82baaf760ebe069695b14c5b5833fb5cd7c2dd0..42f828521d50c85b633c172a44c8b0d37b46cae1 100755 (executable)
--- 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)
@@ -132,15 +124,16 @@ class MainControlWindow (gtk.Window):
 
 if __name__ == "__main__":
 
-       def newpos(pos):
-               print "new pos: ", pos
+
+       import StatusWindow
 
 
        clientCmd = string.join(sys.argv[1:])
        dbgterm = GdbTerminal.GdbTerminal(clientCmd)
        mainCtrlWnd = MainControlWindow(dbgterm)
 
-       mainCtrlWnd.newPosCbs += [newpos]
+       statusWnd = StatusWindow.StatusWindow(mainCtrlWnd, dbgterm)
+       mainCtrlWnd.newPosCbs += [statusWnd.updateValues]
 
        gtk.main()