Use sugar's default font size

3 files changed, 272 insertions, 121 deletions

diff --git a/MANIFEST b/MANIFEST
index 92438ae..3db79c2 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -50,124 +50,124 @@ library/pippy/physics/tools.py
 library/pippy/physics/tools_poly.py
 library/pippy/query.py
 library/pippy/sound.py
-locale/af/LC_MESSAGES/org.laptop.Pippy.mo
-locale/af/activity.linfo
-locale/am/LC_MESSAGES/org.laptop.Pippy.mo
-locale/am/activity.linfo
-locale/ar/LC_MESSAGES/org.laptop.Pippy.mo
-locale/ar/activity.linfo
-locale/ay/LC_MESSAGES/org.laptop.Pippy.mo
-locale/ay/activity.linfo
-locale/bg/LC_MESSAGES/org.laptop.Pippy.mo
-locale/bg/activity.linfo
-locale/bn/LC_MESSAGES/org.laptop.Pippy.mo
-locale/bn/activity.linfo
-locale/bn_IN/LC_MESSAGES/org.laptop.Pippy.mo
-locale/bn_IN/activity.linfo
-locale/ca/LC_MESSAGES/org.laptop.Pippy.mo
-locale/ca/activity.linfo
-locale/de/LC_MESSAGES/org.laptop.Pippy.mo
-locale/de/activity.linfo
-locale/dz/LC_MESSAGES/org.laptop.Pippy.mo
-locale/dz/activity.linfo
-locale/el/LC_MESSAGES/org.laptop.Pippy.mo
-locale/el/activity.linfo
-locale/en/LC_MESSAGES/org.laptop.Pippy.mo
-locale/en/activity.linfo
-locale/en_US/LC_MESSAGES/org.laptop.Pippy.mo
-locale/en_US/activity.linfo
-locale/es/LC_MESSAGES/org.laptop.Pippy.mo
-locale/es/activity.linfo
-locale/fa/LC_MESSAGES/org.laptop.Pippy.mo
-locale/fa/activity.linfo
-locale/fa_AF/LC_MESSAGES/org.laptop.Pippy.mo
-locale/fa_AF/activity.linfo
-locale/ff/LC_MESSAGES/org.laptop.Pippy.mo
-locale/ff/activity.linfo
-locale/fr/LC_MESSAGES/org.laptop.Pippy.mo
-locale/fr/activity.linfo
-locale/gu/LC_MESSAGES/org.laptop.Pippy.mo
-locale/gu/activity.linfo
-locale/ha/LC_MESSAGES/org.laptop.Pippy.mo
-locale/ha/activity.linfo
-locale/hi/LC_MESSAGES/org.laptop.Pippy.mo
-locale/hi/activity.linfo
-locale/ht/LC_MESSAGES/org.laptop.Pippy.mo
-locale/ht/activity.linfo
-locale/ig/LC_MESSAGES/org.laptop.Pippy.mo
-locale/ig/activity.linfo
-locale/is/LC_MESSAGES/org.laptop.Pippy.mo
-locale/is/activity.linfo
-locale/it/LC_MESSAGES/org.laptop.Pippy.mo
-locale/it/activity.linfo
-locale/ja/LC_MESSAGES/org.laptop.Pippy.mo
-locale/ja/activity.linfo
-locale/km/LC_MESSAGES/org.laptop.Pippy.mo
-locale/km/activity.linfo
-locale/ko/LC_MESSAGES/org.laptop.Pippy.mo
-locale/ko/activity.linfo
-locale/mk/LC_MESSAGES/org.laptop.Pippy.mo
-locale/mk/activity.linfo
-locale/ml/LC_MESSAGES/org.laptop.Pippy.mo
-locale/ml/activity.linfo
-locale/mn/LC_MESSAGES/org.laptop.Pippy.mo
-locale/mn/activity.linfo
-locale/mr/LC_MESSAGES/org.laptop.Pippy.mo
-locale/mr/activity.linfo
-locale/mvo/LC_MESSAGES/org.laptop.Pippy.mo
-locale/mvo/activity.linfo
-locale/nb/LC_MESSAGES/org.laptop.Pippy.mo
-locale/nb/activity.linfo
-locale/ne/LC_MESSAGES/org.laptop.Pippy.mo
-locale/ne/activity.linfo
-locale/nl/LC_MESSAGES/org.laptop.Pippy.mo
-locale/nl/activity.linfo
-locale/pa/LC_MESSAGES/org.laptop.Pippy.mo
-locale/pa/activity.linfo
-locale/pap/LC_MESSAGES/org.laptop.Pippy.mo
-locale/pap/activity.linfo
-locale/pis/LC_MESSAGES/org.laptop.Pippy.mo
-locale/pis/activity.linfo
-locale/pl/LC_MESSAGES/org.laptop.Pippy.mo
-locale/pl/activity.linfo
-locale/ps/LC_MESSAGES/org.laptop.Pippy.mo
-locale/ps/activity.linfo
-locale/pt/LC_MESSAGES/org.laptop.Pippy.mo
-locale/pt/activity.linfo
-locale/pt_BR/LC_MESSAGES/org.laptop.Pippy.mo
-locale/pt_BR/activity.linfo
-locale/qu/LC_MESSAGES/org.laptop.Pippy.mo
-locale/qu/activity.linfo
-locale/ro/LC_MESSAGES/org.laptop.Pippy.mo
-locale/ro/activity.linfo
-locale/ru/LC_MESSAGES/org.laptop.Pippy.mo
-locale/ru/activity.linfo
-locale/rw/LC_MESSAGES/org.laptop.Pippy.mo
-locale/rw/activity.linfo
-locale/sd/LC_MESSAGES/org.laptop.Pippy.mo
-locale/sd/activity.linfo
-locale/si/LC_MESSAGES/org.laptop.Pippy.mo
-locale/si/activity.linfo
-locale/sl/LC_MESSAGES/org.laptop.Pippy.mo
-locale/sl/activity.linfo
-locale/te/LC_MESSAGES/org.laptop.Pippy.mo
-locale/te/activity.linfo
-locale/th/LC_MESSAGES/org.laptop.Pippy.mo
-locale/th/activity.linfo
-locale/tpi/LC_MESSAGES/org.laptop.Pippy.mo
-locale/tpi/activity.linfo
-locale/tr/LC_MESSAGES/org.laptop.Pippy.mo
-locale/tr/activity.linfo
-locale/ur/LC_MESSAGES/org.laptop.Pippy.mo
-locale/ur/activity.linfo
-locale/vi/LC_MESSAGES/org.laptop.Pippy.mo
-locale/vi/activity.linfo
-locale/yo/LC_MESSAGES/org.laptop.Pippy.mo
-locale/yo/activity.linfo
-locale/zh_CN/LC_MESSAGES/org.laptop.Pippy.mo
-locale/zh_CN/activity.linfo
-locale/zh_TW/LC_MESSAGES/org.laptop.Pippy.mo
-locale/zh_TW/activity.linfo
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 pippy_app.py
 po/Pippy.pot
 po/af.po
@@ -230,3 +230,151 @@ po/yo.po
 po/zh_CN.po
 po/zh_TW.po
 setup.py
+data/graphics/xolympics
+port/__init__.py
+port/style.py
+locale/cs/activity.linfo
+locale/cs/LC_MESSAGES/org.laptop.Pippy.mo
+locale/te/activity.linfo
+locale/te/LC_MESSAGES/org.laptop.Pippy.mo
+locale/el/activity.linfo
+locale/el/LC_MESSAGES/org.laptop.Pippy.mo
+locale/bg/activity.linfo
+locale/bg/LC_MESSAGES/org.laptop.Pippy.mo
+locale/ps/activity.linfo
+locale/ps/LC_MESSAGES/org.laptop.Pippy.mo
+locale/hu/activity.linfo
+locale/hu/LC_MESSAGES/org.laptop.Pippy.mo
+locale/pap/activity.linfo
+locale/pap/LC_MESSAGES/org.laptop.Pippy.mo
+locale/sk/activity.linfo
+locale/sk/LC_MESSAGES/org.laptop.Pippy.mo
+locale/bn/activity.linfo
+locale/bn/LC_MESSAGES/org.laptop.Pippy.mo
+locale/pl/activity.linfo
+locale/pl/LC_MESSAGES/org.laptop.Pippy.mo
+locale/sl/activity.linfo
+locale/sl/LC_MESSAGES/org.laptop.Pippy.mo
+locale/fa_AF/activity.linfo
+locale/fa_AF/LC_MESSAGES/org.laptop.Pippy.mo
+locale/it/activity.linfo
+locale/it/LC_MESSAGES/org.laptop.Pippy.mo
+locale/sv/activity.linfo
+locale/sv/LC_MESSAGES/org.laptop.Pippy.mo
+locale/sd/activity.linfo
+locale/sd/LC_MESSAGES/org.laptop.Pippy.mo
+locale/nb/activity.linfo
+locale/nb/LC_MESSAGES/org.laptop.Pippy.mo
+locale/mvo/activity.linfo
+locale/mvo/LC_MESSAGES/org.laptop.Pippy.mo
+locale/yo/activity.linfo
+locale/yo/LC_MESSAGES/org.laptop.Pippy.mo
+locale/ar/activity.linfo
+locale/ar/LC_MESSAGES/org.laptop.Pippy.mo
+locale/tr/activity.linfo
+locale/tr/LC_MESSAGES/org.laptop.Pippy.mo
+locale/fa/activity.linfo
+locale/fa/LC_MESSAGES/org.laptop.Pippy.mo
+locale/ig/activity.linfo
+locale/ig/LC_MESSAGES/org.laptop.Pippy.mo
+locale/mn/activity.linfo
+locale/mn/LC_MESSAGES/org.laptop.Pippy.mo
+locale/ha/activity.linfo
+locale/ha/LC_MESSAGES/org.laptop.Pippy.mo
+locale/en_US/activity.linfo
+locale/en_US/LC_MESSAGES/org.laptop.Pippy.mo
+locale/zh_CN/activity.linfo
+locale/zh_CN/LC_MESSAGES/org.laptop.Pippy.mo
+locale/km/activity.linfo
+locale/km/LC_MESSAGES/org.laptop.Pippy.mo
+locale/qu/activity.linfo
+locale/qu/LC_MESSAGES/org.laptop.Pippy.mo
+locale/ff/activity.linfo
+locale/ff/LC_MESSAGES/org.laptop.Pippy.mo
+locale/ru/activity.linfo
+locale/ru/LC_MESSAGES/org.laptop.Pippy.mo
+locale/th/activity.linfo
+locale/th/LC_MESSAGES/org.laptop.Pippy.mo
+locale/rw/activity.linfo
+locale/rw/LC_MESSAGES/org.laptop.Pippy.mo
+locale/ca/activity.linfo
+locale/ca/LC_MESSAGES/org.laptop.Pippy.mo
+locale/bn_IN/activity.linfo
+locale/bn_IN/LC_MESSAGES/org.laptop.Pippy.mo
+locale/gu/activity.linfo
+locale/gu/LC_MESSAGES/org.laptop.Pippy.mo
+locale/pt/activity.linfo
+locale/pt/LC_MESSAGES/org.laptop.Pippy.mo
+locale/wa/activity.linfo
+locale/wa/LC_MESSAGES/org.laptop.Pippy.mo
+locale/ro/activity.linfo
+locale/ro/LC_MESSAGES/org.laptop.Pippy.mo
+locale/pis/activity.linfo
+locale/pis/LC_MESSAGES/org.laptop.Pippy.mo
+locale/es/activity.linfo
+locale/es/LC_MESSAGES/org.laptop.Pippy.mo
+locale/tpi/activity.linfo
+locale/tpi/LC_MESSAGES/org.laptop.Pippy.mo
+locale/si/activity.linfo
+locale/si/LC_MESSAGES/org.laptop.Pippy.mo
+locale/pt_BR/activity.linfo
+locale/pt_BR/LC_MESSAGES/org.laptop.Pippy.mo
+locale/fr/activity.linfo
+locale/fr/LC_MESSAGES/org.laptop.Pippy.mo
+locale/he/activity.linfo
+locale/he/LC_MESSAGES/org.laptop.Pippy.mo
+locale/sw/activity.linfo
+locale/sw/LC_MESSAGES/org.laptop.Pippy.mo
+locale/dz/activity.linfo
+locale/dz/LC_MESSAGES/org.laptop.Pippy.mo
+locale/en/activity.linfo
+locale/en/LC_MESSAGES/org.laptop.Pippy.mo
+locale/ja/activity.linfo
+locale/ja/LC_MESSAGES/org.laptop.Pippy.mo
+locale/bi/activity.linfo
+locale/bi/LC_MESSAGES/org.laptop.Pippy.mo
+locale/ur/activity.linfo
+locale/ur/LC_MESSAGES/org.laptop.Pippy.mo
+locale/ko/activity.linfo
+locale/ko/LC_MESSAGES/org.laptop.Pippy.mo
+locale/mk/activity.linfo
+locale/mk/LC_MESSAGES/org.laptop.Pippy.mo
+locale/ml/activity.linfo
+locale/ml/LC_MESSAGES/org.laptop.Pippy.mo
+locale/vi/activity.linfo
+locale/vi/LC_MESSAGES/org.laptop.Pippy.mo
+locale/mr/activity.linfo
+locale/mr/LC_MESSAGES/org.laptop.Pippy.mo
+locale/ay/activity.linfo
+locale/ay/LC_MESSAGES/org.laptop.Pippy.mo
+locale/fi/activity.linfo
+locale/fi/LC_MESSAGES/org.laptop.Pippy.mo
+locale/de/activity.linfo
+locale/de/LC_MESSAGES/org.laptop.Pippy.mo
+locale/zh_TW/activity.linfo
+locale/zh_TW/LC_MESSAGES/org.laptop.Pippy.mo
+locale/am/activity.linfo
+locale/am/LC_MESSAGES/org.laptop.Pippy.mo
+locale/ht/activity.linfo
+locale/ht/LC_MESSAGES/org.laptop.Pippy.mo
+locale/is/activity.linfo
+locale/is/LC_MESSAGES/org.laptop.Pippy.mo
+locale/nl/activity.linfo
+locale/nl/LC_MESSAGES/org.laptop.Pippy.mo
+locale/ne/activity.linfo
+locale/ne/LC_MESSAGES/org.laptop.Pippy.mo
+locale/af/activity.linfo
+locale/af/LC_MESSAGES/org.laptop.Pippy.mo
+locale/pa/activity.linfo
+locale/pa/LC_MESSAGES/org.laptop.Pippy.mo
+locale/hi/activity.linfo
+locale/hi/LC_MESSAGES/org.laptop.Pippy.mo
+po/sv.po
+po/cs.po
+po/wa.po
+po/sw.po
+po/hu.po
+po/sk.po
+po/fi.po
+po/bi.po
+po/he.po
diff --git a/activity/activity.info b/activity/activity.info
index 22be552..bccdbaa 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -4,7 +4,7 @@ bundle_id = org.laptop.Pippy
 service_name = org.laptop.Pippy
 class = pippy_app.PippyActivity
 icon = activity-icon
-activity_version = 32
+activity_version = 33
 mime_types = text/x-python
 show_launcher = yes
 
diff --git a/pippy_app.py b/pippy_app.py
index bd54ae2..f019520 100644
--- a/pippy_app.py
+++ b/pippy_app.py
@@ -37,6 +37,8 @@ from dbus.gobject_service import ExportedGObject
 from activity import ViewSourceActivity, TARGET_TYPE_TEXT
 from sugar.activity.activity import ActivityToolbox, \
      get_bundle_path, get_bundle_name
+from sugar.graphics import style
+
 from sugar.presence import presenceservice
 
 from sugar.presence.tubeconn import TubeConnection
@@ -144,7 +146,8 @@ class PippyActivity(ViewSourceActivity):
         self.text_view.set_cursor_visible(True)
         self.text_view.set_show_line_numbers(True)
         self.text_view.set_wrap_mode(gtk.WRAP_CHAR)
-        self.text_view.modify_font(pango.FontDescription("Monospace " + str(font_zoom(8))))
+        self.text_view.modify_font(pango.FontDescription("Monospace " + 
+            str(font_zoom(style.FONT_SIZE))))
 
         # We could change the color theme here, if we want to.
         #mgr = gtksourceview2.style_manager_get_default()
@@ -191,7 +194,7 @@ class PippyActivity(ViewSourceActivity):
         self._vte.set_encoding('utf-8')
         self._vte.set_size(30, 5)
         self._vte.set_size_request(200, 300)
-        font = 'Monospace ' + str(font_zoom(8))
+        font = 'Monospace ' + str(font_zoom(style.FONT_SIZE))
         self._vte.set_font(pango.FontDescription(font))
         self._vte.set_colors(gtk.gdk.color_parse ('#000000'),
                              gtk.gdk.color_parse ('#E7E7E7'),