Overwrite breakpoints when launching pygdb from vim, updating vim also after quit

[pygdb.git] / MainControlWindow.py

diff --git a/MainControlWindow.py b/MainControlWindow.py
index 0a24f4cfc9efa2894f157a75342caf880c935a1a..0b5c3f11413e36067c55c373fbb625a63d20d8ca 100644 (file)
--- 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 )
+
+               dbgterm.gotActiveCallback += [self.enableButtons]
+               dbgterm.gotInactiveCallback += [self.disableButtons]
 
                #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)
 
@@ -74,49 +76,31 @@ class MainControlWindow (gtk.Window):
 
 
        def runBtnClicked(self, btn):
-               self.disableButtons()
                pos = self.dbgterm.setRun()
-               self.newSourcePosition(pos)
-               self.enableButtons()
 
        def continueBtnClicked(self, btn):
-               self.disableButtons()
                pos = self.dbgterm.setContinue()
-               self.newSourcePosition(pos)
-               self.enableButtons()
 
        def stepoverBtnClicked(self, btn):
-               self.disableButtons()
                pos = self.dbgterm.setStepover()
-               self.newSourcePosition(pos)
-               self.enableButtons()
 
        def stepinBtnClicked(self, btn):
-               self.disableButtons()
                pos = self.dbgterm.setStepin()
-               self.newSourcePosition(pos)
-               self.enableButtons()
 
        def quitBtnClicked(self, btn):
                self.dbgterm.setQuit()
 
-       def disableButtons(self):
+       def disableButtons(self, *w):
                self.runBtn.handler_block(self.runBtnHandler)
                self.continueBtn.handler_block(self.continueBtnHandler)
                self.stepoverBtn.handler_block(self.stepoverBtnHandler)
                self.stepinBtn.handler_block(self.stepinBtnHandler)
                self.quitBtn.handler_block(self.quitBtnHandler)
 
-       def enableButtons(self):
+       def enableButtons(self, *w):
                self.runBtn.handler_unblock(self.runBtnHandler)
                self.continueBtn.handler_unblock(self.continueBtnHandler)
                self.stepoverBtn.handler_unblock(self.stepoverBtnHandler)
                self.stepinBtn.handler_unblock(self.stepinBtnHandler)
                self.quitBtn.handler_unblock(self.quitBtnHandler)
 
-       def newSourcePosition(self, pos):
-               #Call the callbacks
-               for cb in self.newPosCbs:
-                       cb(pos)
-
-