some code beautifying incl. waitForRx

[pygdb.git] / MainControlWindow.py

diff --git a/MainControlWindow.py b/MainControlWindow.py
old mode 100755 (executable)
new mode 100644 (file)
index 42f8285..c8706d9
--- a/MainControlWindow.py
+++ b/MainControlWindow.py
@@ -10,20 +10,20 @@ import sys
 import vte
 
 
-import GdbTerminal
+import DbgTerminal
 import ClientIOTerminal
 
 
 class MainControlWindow (gtk.Window):
 
-       #Callbacks for new positions
-       newPosCbs = []
-
        def __init__(self, dbgterm):
 
                #Set up GTK stuff
                gtk.Window.__init__(self)
-               self.connect("destroy", lambda *w: gtk.main_quit())
+               self.connect("destroy", DbgTerminal.quitHandler )
+
+               #Callbacks for new positions
+               self.newPosCbs = []
 
                #Set terminals
                self.dbgterm = dbgterm
@@ -39,8 +39,8 @@ class MainControlWindow (gtk.Window):
                self.add(vbox)
 
                #Button box
-               hbtnbox = gtk.HButtonBox()
-               hbtnbox.set_layout(gtk.BUTTONBOX_START)
+               hbtnbox = gtk.HBox(False, spacing=5)
+               #hbtnbox.set_layout(gtk.BUTTONBOX_START)
                vbox.pack_start(hbtnbox)
 
                self.runBtn = gtk.Button("Run")
@@ -63,8 +63,10 @@ class MainControlWindow (gtk.Window):
 
                #Install handlers
                self.runBtnHandler = self.runBtn.connect('clicked', self.runBtnClicked)
-               self.continueBtnHandler = self.continueBtn.connect('clicked', self.continueBtnClicked)
-               self.stepoverBtnHandler = self.stepoverBtn.connect('clicked', self.stepoverBtnClicked)
+               self.continueBtnHandler = self.continueBtn.connect('clicked', \
+                               self.continueBtnClicked)
+               self.stepoverBtnHandler = self.stepoverBtn.connect('clicked', \
+                               self.stepoverBtnClicked)
                self.stepinBtnHandler = self.stepinBtn.connect('clicked', self.stepinBtnClicked)
                self.quitBtnHandler = self.quitBtn.connect('clicked', self.quitBtnClicked)
 
@@ -120,21 +122,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()
-
-