- Fixed bug when bp is set on same addr

[pygdb.git] / WatchesFrame.py

diff --git a/WatchesFrame.py b/WatchesFrame.py
index a792501b956ef26f5efff9c686ddcd7e064a9fc2..675e47ccb36f49328dc7c100c10d0f53e23f6443 100644 (file)
--- a/WatchesFrame.py
+++ b/WatchesFrame.py
@@ -9,15 +9,16 @@ import gtk
 import vte
 
 import DbgTerminal
+import StatusFrame
 
 
-class WatchesFrame (gtk.Frame):
+class WatchesFrame (StatusFrame.StatusFrame):
 
 
        def __init__(self, debugger):
 
-               gtk.Frame.__init__(self, "Watches")
-               self.debugger = debugger
+               StatusFrame.StatusFrame.__init__(self, debugger)
+               self.set_label("Watches")
 
                vbox = gtk.VBox(False, 5)
                self.add(vbox)
@@ -87,13 +88,25 @@ class WatchesFrame (gtk.Frame):
                        model.set(iter, 1, res)
 
 
+       def applyConfiguration(self, conf):
+               for w in conf.watches:
+                       iter = self.model.append()
+                       self.model.set(iter, 0, w["expr"], 1, "<unkown>", 2, True)
+               self.updateValues(None)
+
+
+       def fillConfiguration(self, conf):
+               iter = self.model.get_iter_first()
+               while iter != None:
+                       expr, = self.model.get(iter, 0)
+                       conf.parseWatch(expr)
+                       iter = self.model.iter_next(iter)
 
 
        def addBtnClicked(self, btn):
                iter = self.model.append()
                self.model.set(iter, 0, "0", 1, "0", 2, True)
 
-
        def delBtnClicked(self, btn):
                selection = self.tv.get_selection()
                model, paths = selection.get_selected_rows()
@@ -102,13 +115,9 @@ class WatchesFrame (gtk.Frame):
                        iter = model.get_iter(path)
                        model.remove(iter)
 
-
-       def updateValues(self):
-
+       def updateValues(self, pos):
                iter = self.model.get_iter_first()
-
                while iter != None:
-
                        expr, = self.model.get(iter, 0)
                         res = self.debugger.getExpression(expr)
                         self.model.set(iter, 1, res)