Ticket #1690: 0001-Retain-font-family-and-font-size.patch

AbiWordActivity.py

@@ -19 +19 @@
 from gettext import gettext as _
 import logging
 import os
+import ConfigParser
 
 # Abiword needs this to happen as soon as possible
 import gobject
@@ -27 +28 @@
 import gtk
 import telepathy
 import telepathy.client
+import os
+
 
 from abiword import Canvas
 
@@ -53 +56 @@
 from speechtoolbar import SpeechToolbar
 
 logger = logging.getLogger('write-activity')
+DEFAULT_CONFIG_PATH = get_bundle_path() + '/font.cfg'
 
 
 class AbiWordActivity(activity.Activity):
@@ -60 +64 @@
     def __init__(self, handle):
         activity.Activity.__init__(self, handle)
 
+        self.font      = 'Sans' # Default, only used when no configuration is present
+
+        if os.path.exists('/etc/font.cfg'):
+            self._read_configuration('/etc/font.cfg')
+        elif os.path.exists(DEFAULT_CONFIG_PATH):
+            self._read_configuration(DEFAULT_CONFIG_PATH)
+
         # abiword uses the current directory for all its file dialogs
         os.chdir(os.path.expanduser('~'))
 
@@ -160 +171 @@
 
         self.abiword_canvas.connect('size-allocate', self.size_allocate_cb)
 
+    def _read_configuration(self, file_name):
+        logging.debug('Reading configuration from file %s' % file_name)
+        fp = open(file_name)
+        config  = ConfigParser.ConfigParser()
+        config.readfp(fp)
+        fp.close()
+        
+        if config.has_section('Config') and config.has_option('Config', 'font'):
+            self.font = config.get('Config', 'font')
+            logging.debug("Setting font to %s" % self.font)
+                
+        logging.debug('font %s', self.font)
+
     def size_allocate_cb(self, abi, alloc):
         gobject.idle_add(abi.queue_draw)
 
@@ -205 +229 @@
                 keybindings_file, 0, 0)
         # set default font
         self.abiword_canvas.select_all()
-        # get_selection return content and length
-        if self.abiword_canvas.get_selection('text/plain')[1] == 0:
-            logging.error('Setting default font to Sans in new documents')
-            self.abiword_canvas.set_font_name('Sans')
+        # get_selection gives out random values of length for empty documents
+        # get_content returns content
+        if len(self.abiword_canvas.get_content('text/plain')) == 0:
+            logging.debug('Setting default font to %s in new documents' % self.font)
+            self.abiword_canvas.set_font_name(self.font)
         self.abiword_canvas.moveto_bod()
 
     def get_preview(self):

new file font.cfg

@@ +1 @@
+[Config]
+font = Sans
+fontsize = 12
+

widgets.py

@@ -17 +17 @@
 import time
 from gettext import gettext as _
 import logging
+import ConfigParser
 
 from sugar.graphics.radiotoolbutton import RadioToolButton
 from sugar.graphics.combobox import ComboBox
@@ -24 +25 @@
 from sugar.graphics.toolbutton import ToolButton
 from sugar.graphics.menuitem import MenuItem
 from sugar.datastore import datastore
+from sugar.activity.activity import get_bundle_path
 
 from sugar.activity.activity import SCOPE_PRIVATE
 
 logger = logging.getLogger('write-activity')
+DEFAULT_CONFIG_PATH = get_bundle_path() + '/font.cfg'
 
 """
 # The FontCombo is not used anymore, keep the code here for reference
@@ -97 +100 @@
 class FontSizeCombo(ComboBox):
 
     def __init__(self, abi):
-        ComboBox.__init__(self)
+        ComboBox.__init__(self)
+
+        self.fontsize = '12'
 
-        self._abi_handler = abi.connect('font-size', self._font_size_cb)
+        self._abi_handler = abi.connect('font-size', self._font_size_cb)
 
         self._font_sizes = ['8', '9', '10', '11', '12', '14', '16', '20', \
                             '22', '24', '26', '28', '36', '48', '72']
         self._changed_id = self.connect('changed', self._font_size_changed_cb,
                 abi)
 
+        if os.path.exists('/etc/font.cfg'):
+            self._read_configuration('/etc/font.cfg')
+        elif os.path.exists(DEFAULT_CONFIG_PATH):
+            self._read_configuration(DEFAULT_CONFIG_PATH)
+
         for i, s in enumerate(self._font_sizes):
             self.append_item(i, s, None)
-            if s == '12':
+            if s == self.fontsize:
                 self.set_active(i)
+        
+
+    def _read_configuration(self, file_name):
+        logging.debug('Reading configuration from file %s (for fontsize)' % file_name)
+        fp = open(file_name)
+        config  = ConfigParser.ConfigParser()
+        config.readfp(fp)
+        fp.close()
+
+        if config.has_section('Config') and config.has_option('Config', 'fontsize'):
+            self.fontsize = config.get('Config', 'fontsize')
+            if self.fontsize in self._font_sizes:
+                logging.debug("Setting fontsize to %s" % self.fontsize)
+            else:
+                self.fontsize = '12'
+
+        logging.debug('font size %s', self.fontsize)
 
     def _font_size_changed_cb(self, combobox, abi):
         if self.get_active() != -1: