Changes to font sizes, try catch blocks on some unnecessary imports (remove them?),

fixed rad/deg switch

3 files changed, 36 insertions, 16 deletions

diff --git a/calculate.py b/calculate.py
index 0eb42b1..a5d3ff8 100644
--- a/calculate.py
+++ b/calculate.py
@@ -38,8 +38,11 @@ import sugar.profile
 from sugar.graphics.canvasicon import CanvasIcon
 from sugar.graphics.xocolor import XoColor
 from sugar.graphics import color
-from sugar.graphics import font
-
+try:
+    from sugar.graphics import font
+except:
+    #Nothing
+    pass
 from layout import CalcLayout
 from mathlib import MathLib
 from eqnparser import EqnParser
@@ -58,11 +61,12 @@ class Calculate(activity.Activity):
     TYPE_OP_POST = 3
     TYPE_TEXT = 4
     
-    FONT_SMALL = "sans bold 14"
-    FONT_BIG = "sans bold 20"
-    FONT_BIG_NARROW = "sans italic 20"
-    FONT_BIGGER = "sans bold 24"
-    
+    FONT_SMALL = "sans 10"
+    FONT_SMALL_NARROW = "sans italic 10"
+    FONT_BIG = "sans bold 16"
+    FONT_BIG_NARROW = "sans italic 16"
+    FONT_BIGGER = "sans bold 22"
+   
     def __init__(self, handle):
         activity.Activity.__init__(self, handle)
 
@@ -173,7 +177,7 @@ class Calculate(activity.Activity):
     def format_var_buf(self, buf):
         iter_start = buf.get_start_iter()
         iter_end = buf.get_end_iter()
-        buf.apply_tag(buf.create_tag(font=self.FONT_BIG),
+        buf.apply_tag(buf.create_tag(font=self.FONT_SMALL_NARROW),
             iter_start, iter_end)
         buf.apply_tag(buf.create_tag(foreground=self.color.get_fill_color()), 
             iter_start, iter_end)
@@ -193,10 +197,22 @@ class Calculate(activity.Activity):
 
     def format_history_buf(self, buf):
         iter_start = buf.get_start_iter()
+        iter_colon = buf.get_start_iter()
         iter_end = buf.get_end_iter()
         iter_middle = buf.get_iter_at_line(1)
-        buf.apply_tag(buf.create_tag(font=self.FONT_SMALL),
-            iter_start, iter_middle)
+        try:
+            pos = buf.get_text(iter_start, iter_end).index(':')
+            iter_colon.forward_chars(pos)
+        except:
+            buf.apply_tag(buf.create_tag(font=self.FONT_SMALL),
+                          iter_start, iter_middle)
+        else:
+
+            buf.apply_tag(buf.create_tag(font=self.FONT_SMALL_NARROW),
+                          iter_start, iter_colon)
+            buf.apply_tag(buf.create_tag(font=self.FONT_SMALL),
+                          iter_colon, iter_middle)
+            
         buf.apply_tag(buf.create_tag(font=self.FONT_BIG,
             justification=gtk.JUSTIFY_RIGHT), iter_middle, iter_end)
         buf.apply_tag(buf.create_tag(foreground=self.color.get_fill_color()), 
diff --git a/layout.py b/layout.py
index f9f2971..30b5996 100644
--- a/layout.py
+++ b/layout.py
@@ -6,8 +6,11 @@ pygtk.require('2.0')
 import gtk
 import pango
 from sugar.activity import activity
-from sugar.graphics import font
-
+try:
+    from sugar.graphics import font
+except:
+    #Not important, don't do anythig
+    pass
 from toolbars import *
 
 class CalcLayout:
@@ -99,7 +102,7 @@ class CalcLayout:
         self.pad = gtk.Table(4, 6, True)
         self.pad.set_row_spacings(6)
         self.pad.set_col_spacings(6)
-
+        #self.pad.
         self.create_button_data()
         self.buttons = []
         for x, y, w, cap, bgcol, cb in self.button_data:
diff --git a/toolbars.py b/toolbars.py
index 3b426e4..9bbb009 100644
--- a/toolbars.py
+++ b/toolbars.py
@@ -147,11 +147,12 @@ class FormatToolbar(gtk.Toolbar):
     def __init__(self, calc):
         gtk.Toolbar.__init__(self)
         el = ['deg', 'rad']
-        self.insert(TextToggleToolButton(el, self.update_angle_type), -1)
+        self.insert(TextToggleToolButton(el, 
+                    lambda x: self.update_angle_type(x, calc)), -1)
     
-    def update_angle_type(self, text):
+    def update_angle_type(self, text, calc):
         if text == 'deg':
             calc.ml.set_angle_type(MathLib.ANGLE_DEG)
         elif text == 'rad':
             calc.ml.set_angle_type(MathLib.ANGLE_RAD)
-        _logger.debug('Angle type: %s', calc.ml.angle_scaling)
+        _logger.debug('Angle type: %s', self.calc.ml.angle_scaling)