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

AbiWordActivity.py

@@ -1 +1 @@
 # Copyright (C) 2006 by Martin Sevior
 # Copyright (C) 2006-2007 Marc Maurer <uwog@uwog.net>
 # Copyright (C) 2007, One Laptop Per Child
+# Copyright (C) 2012, Aneesh Dogra <lionaneesh@gmail.com>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27 +28 @@
 import gtk
 import telepathy
 import telepathy.client
+import ConfigParser
 
 from abiword import Canvas
 
@@ -53 +55 @@
 from speechtoolbar import SpeechToolbar
 
 logger = logging.getLogger('write-activity')
+DEFAULT_CONFIG_PATH = os.path.join(get_bundle_path(), 'font.cfg')
 
 
 class AbiWordActivity(activity.Activity):
@@ -60 +63 @@
     def __init__(self, handle):
         activity.Activity.__init__(self, handle)
 
+        # Defaults, only used when no configuration is present
+        self.font = 'Sans'
+        self.fontsize = '12'
+
+        if os.path.exists('/etc/font.cfg'):
+            self.font, self.fontsize = \
+            self._read_configuration('/etc/font.cfg')
+        elif os.path.exists(DEFAULT_CONFIG_PATH):
+            self.font, self.fontsize = \
+            self._read_configuration(DEFAULT_CONFIG_PATH)
+
         # abiword uses the current directory for all its file dialogs
         os.chdir(os.path.expanduser('~'))
 
@@ -97 +111 @@
         text_toolbar.props.icon_name = 'format-text'
         text_toolbar.props.label = _('Text')
         toolbar_box.toolbar.insert(text_toolbar, -1)
+        fontsize_combo = text_toolbar.props.page.font_size_combo.combo
+
+        for i, s in enumerate(fontsize_combo._font_sizes):
+            if s == self.fontsize:
+                logging.debug("Setting fontsize to: %s, Index: %d", s, i)
+                fontsize_combo.set_active(i)
+                break
 
         para_toolbar = ToolbarButton()
         para_toolbar.props.page = ParagraphToolbar(self.abiword_canvas)
@@ -189 +210 @@
                     self._buddy_joined_cb)
             self._shared_activity.connect('buddy-left', self._buddy_left_cb)
             if self.get_shared():
-#                # oh, OK, we've already joined
+                # oh, OK, we've already joined
                 self._joined_cb()
         else:
             # we are creating the activity
             logger.error("We are creating an activity")
 
+    def _read_configuration(self, filepath):
+        logging.debug('Reading configuration from file %s' % filepath)
+        fp = open(filepath)
+        config = ConfigParser.ConfigParser()
+        config.readfp(fp)
+        fp.close()
+        if (config.has_section('Config') and \
+            config.has_option('Config', 'fontsize')):
+            fontsize = config.get('Config', 'fontsize')
+        else:
+            fontsize = self.fontsize
+
+        if (config.has_section('Config') and \
+            config.has_option('Config', 'font')):
+            font = config.get('Config', 'font')
+        else:
+            font = self.font
+
+        return (font, fontsize)
+
     def __map_activity_event_cb(self, event, activity):
         # set custom keybindings for Write
         # we do it later because have problems if done before - OLPC #11049
@@ -205 +246 @@
                 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')
+
+        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

toolbar.py

@@ -420 +420 @@
                 self._font_family_cb)
         self.insert(ToolComboBox(self.font_name_combo), -1)
 
-        font_size = ToolComboBox(FontSizeCombo(abiword_canvas))
-        self.insert(font_size, -1)
+        self.font_size_combo = ToolComboBox(FontSizeCombo(abiword_canvas))
+        self.insert(self.font_size_combo, -1)
 
         bold = ToggleToolButton('format-text-bold')
         bold.set_tooltip(_('Bold'))

widgets.py

@@ -98 +98 @@
 
     def __init__(self, abi):
         ComboBox.__init__(self)
-
         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,
@@ -108 +106 @@
 
         for i, s in enumerate(self._font_sizes):
             self.append_item(i, s, None)
-            if s == '12':
-                self.set_active(i)
 
     def _font_size_changed_cb(self, combobox, abi):
         if self.get_active() != -1: