From 66b4ed35e538967073456cc9a0c0d148dadbc146 Mon Sep 17 00:00:00 2001
From: sqlcoder <sqlcoder@buylow.plus.com>
Date: Sat, 5 Dec 2009 22:48:41 +0000
Subject: [PATCH] add refresh button to log viewer

---
 pyfpdb/GuiLogView.py | 50 +++++++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/pyfpdb/GuiLogView.py b/pyfpdb/GuiLogView.py
index 0f7f03c7..3b7b8aa6 100755
--- a/pyfpdb/GuiLogView.py
+++ b/pyfpdb/GuiLogView.py
@@ -52,19 +52,44 @@ class GuiLogView:
 
         self.listview = gtk.TreeView(model=self.liststore)
         self.listview.set_grid_lines(gtk.TREE_VIEW_GRID_LINES_NONE)
+        self.listcols = []
 
         scrolledwindow = gtk.ScrolledWindow()
         scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
-        self.vbox.pack_start(scrolledwindow, expand=True, fill=True, padding=0)
         scrolledwindow.add(self.listview)
+        self.vbox.pack_start(scrolledwindow, expand=True, fill=True, padding=0)
+
+        refreshbutton = gtk.Button("Refresh")
+        refreshbutton.connect("clicked", self.refresh, None)
+        self.vbox.pack_start(refreshbutton, False, False, 3)
+        refreshbutton.show()
 
         self.listview.show()
         scrolledwindow.show()
         self.vbox.show()
 
+        col = self.addColumn("Date/Time", 0)
+        col = self.addColumn("Module", 1)
+        col = self.addColumn("Level", 2)
+        col = self.addColumn("Text", 3)
+
         self.loadLog()
         self.vbox.show_all()
 
+    def addColumn(self, title, n):
+        col = gtk.TreeViewColumn(title)
+        self.listview.append_column(col)
+        cRender = gtk.CellRendererText()
+        cRender.set_property("wrap-mode", pango.WRAP_WORD_CHAR)
+        col.pack_start(cRender, True)
+        col.add_attribute(cRender, 'text', n)
+        col.set_max_width(1000)
+        col.set_spacing(0)  # no effect
+        self.listcols.append(col)
+        col.set_clickable(True)
+        col.connect("clicked", self.sortCols, n)
+        return(col)
+
     def loadLog(self):
 
         #self.configStore = gtk.TreeStore(gobject.TYPE_PYOBJECT, gobject.TYPE_STRING, gobject.TYPE_STRING)
@@ -73,12 +98,6 @@ class GuiLogView:
         self.liststore.clear()
         self.listcols = []
 
-        col = self.addColumn("Date/Time", 0)
-
-        col = self.addColumn("Module", 1)
-        col = self.addColumn("Level", 2)
-        col = self.addColumn("Text", 3)
-
         # count number of lines in file
         f = open('logging.out', "r+")
         buf = mmap.mmap(f.fileno(), 0)
@@ -107,20 +126,6 @@ class GuiLogView:
             line = readline()
         f.close()
 
-    def addColumn(self, title, n):
-        col = gtk.TreeViewColumn(title)
-        self.listview.append_column(col)
-        cRender = gtk.CellRendererText()
-        cRender.set_property("wrap-mode", pango.WRAP_WORD_CHAR)
-        col.pack_start(cRender, True)
-        col.add_attribute(cRender, 'text', n)
-        col.set_max_width(1000)
-        col.set_spacing(0)  # no effect
-        self.listcols.append(col)
-        col.set_clickable(True)
-        col.connect("clicked", self.sortCols, n)
-        return(col)
-
     def sortCols(self, col, n):
         try:
             if not col.get_sort_indicator() or col.get_sort_order() == gtk.SORT_ASCENDING:
@@ -139,6 +144,9 @@ class GuiLogView:
             print "***sortCols error: " + str(sys.exc_info()[1])
             print "\n".join( [e[0]+':'+str(e[1])+" "+e[2] for e in err] )
 
+    def refresh(self, widget, data):
+        self.loadLog()
+
 
 
 if __name__=="__main__":