[or-cvs] r24049: {arm} Log entries weren't being properly bracketed by date divider (arm/trunk/src/interface)

[Damian Johnson <atagar1@xxxxxxxxx>]

Author: atagar
Date: 2011-01-07 16:33:55 +0000 (Fri, 07 Jan 2011)
New Revision: 24049

Modified:
   arm/trunk/src/interface/controller.py
   arm/trunk/src/interface/logPanel.py
Log:
Log entries weren't being properly bracketed by date dividers when scroll bar wasn't visible (caught thanks to twur)



Modified: arm/trunk/src/interface/controller.py
===================================================================
--- arm/trunk/src/interface/controller.py	2011-01-07 16:10:09 UTC (rev 24048)
+++ arm/trunk/src/interface/controller.py	2011-01-07 16:33:55 UTC (rev 24049)
@@ -506,9 +506,9 @@
       
       if mismatchLines:
         if len(mismatchLines) > 1:
-          msg += "\n- torrc values differ on line lines: "
+          msg += "\n- torrc values differ on lines: "
         else:
-          msg += "\n- torrc value differs on line line: "
+          msg += "\n- torrc value differs on line: "
         
         mismatchLines.sort()
         msg += ", ".join([str(val + 1) for val in mismatchLines])

Modified: arm/trunk/src/interface/logPanel.py
===================================================================
--- arm/trunk/src/interface/logPanel.py	2011-01-07 16:10:09 UTC (rev 24048)
+++ arm/trunk/src/interface/logPanel.py	2011-01-07 16:33:55 UTC (rev 24049)
@@ -794,7 +794,7 @@
     self.scroll = max(0, min(self.scroll, self.lastContentHeight - height + 1))
     
     # draws left-hand scroll bar if content's longer than the height
-    msgIndent, dividerIndent = 0, 0 # offsets for scroll bar
+    msgIndent, dividerIndent = 1, 0 # offsets for scroll bar
     isScrollBarVisible = self.lastContentHeight > height - 1
     if isScrollBarVisible:
       msgIndent, dividerIndent = 3, 2