From f0dfca7041be6e1a9065100171022070615e1072 Mon Sep 17 00:00:00 2001
From: Zsolt Foldvari <zfoldvar@users.sourceforge.net>
Date: Tue, 13 Feb 2007 15:47:56 +0000
Subject: [PATCH] 2007-02-13  Zsolt Foldvari  <zfoldvar@users.sourceforge.net> 
 * src/GrampsWidgets.py: Merge trunk changes r7950:8105 	*
 src/MarkupText.py: cleanup

svn: r8106
---
 ChangeLog            |  4 ++++
 src/GrampsWidgets.py | 21 +++++++++++----------
 src/MarkupText.py    | 24 ++++++++++++++++--------
 3 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index be6cb4644..2823beb69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-02-13  Zsolt Foldvari  <zfoldvar@users.sourceforge.net>
+	* src/GrampsWidgets.py: Merge trunk changes r7950:8105
+	* src/MarkupText.py: cleanup
+
 2007-02-12  Don Allingham  <don@gramps-project.org>
 	* src/GrampsDbUtils/_GedcomParse.py: cleanup
 
diff --git a/src/GrampsWidgets.py b/src/GrampsWidgets.py
index 5cb6c416c..eec998b04 100644
--- a/src/GrampsWidgets.py
+++ b/src/GrampsWidgets.py
@@ -68,6 +68,11 @@ from DdTargets import DdTargets
 _lock_path = os.path.join(const.image_dir, 'stock_lock.png')
 _lock_open_path = os.path.join(const.image_dir, 'stock_lock-open.png')
 
+# STOCK_INFO was added only in Gtk 2.8
+try:
+    INFO_ICON = gtk.STOCK_INFO
+except:
+    INFO_ICON = gtk.STOCK_DIALOG_INFO
 
 hand_cursor = gtk.gdk.Cursor(gtk.gdk.HAND2)
 def realize_cb(widget):
@@ -135,16 +140,12 @@ class IconButton(gtk.Button):
 class WarnButton(gtk.Button):
     def __init__(self):
         gtk.Button.__init__(self)
-        image = gtk.Image()
 
-        # Some versions of FreeBSD don't seem to have STOCK_INFO
-        try:
-            image.set_from_stock(gtk.STOCK_INFO, gtk.ICON_SIZE_MENU)
-        except:
-            image.set_from_stock(gtk.STOCK_DIALOG_INFO, gtk.ICON_SIZE_MENU)
-            
+        image = gtk.Image()
+        image.set_from_stock(INFO_ICON, gtk.ICON_SIZE_MENU)
         image.show()
         self.add(image)
+
         self.set_relief(gtk.RELIEF_NONE)
         self.show()
         self.func = None
@@ -2007,7 +2008,7 @@ if gtk.pygtk_version < (2,8,0):
 #number = (int, float, long)
 
 VALIDATION_ICON_WIDTH = 16
-MANDATORY_ICON = gtk.STOCK_INFO
+MANDATORY_ICON = INFO_ICON
 ERROR_ICON = gtk.STOCK_STOP
 
 class ValidatableMaskedEntry(MaskedEntry):
@@ -2320,8 +2321,8 @@ def main(args):
     
     widget1 = ValidatableMaskedEntry(str)
     widget1.set_completion_mode(inline=True, popup=False)
-    #widget1.set_default_error_msg("'%s' is not a default Event")
-    widget1.set_default_error_msg(widget1)
+    widget1.set_default_error_msg("'%s' is not a default Event")
+    #widget1.set_default_error_msg(widget1)
     widget1.prefill(('Birth', 'Death', 'Conseption'))
     #widget1.set_exact_completion(True)
     vbox.pack_start(widget1, fill=False)
diff --git a/src/MarkupText.py b/src/MarkupText.py
index af609b764..50cef50c9 100644
--- a/src/MarkupText.py
+++ b/src/MarkupText.py
@@ -20,9 +20,14 @@
 
 # $Id$
 
+"Handling formatted ('rich text') strings"
+
+__revision__ = "$Revision$"
+__author__   = "Zsolt Foldvari"
+
 #-------------------------------------------------------------------------
 #
-# Python classes
+# Python modules
 #
 #-------------------------------------------------------------------------
 from xml.sax import saxutils, xmlreader, ContentHandler
@@ -35,7 +40,7 @@ except:
 
 #-------------------------------------------------------------------------
 #
-# set up logging
+# Set up logging
 #
 #-------------------------------------------------------------------------
 import logging
@@ -43,11 +48,12 @@ log = logging.getLogger(".MarkupText")
 
 #-------------------------------------------------------------------------
 #
-# GTK libraries
+# GTK modules
 #
 #-------------------------------------------------------------------------
 import gtk
 
+
 class MarkupParser(ContentHandler):
     """A simple ContentHandler class to parse Gramps markup'ed text.
     
@@ -247,6 +253,8 @@ class MarkupBuffer(gtk.TextBuffer):
     It implements MarkupParser and MarkupWriter on the input/output interface.
     Also translates Gramps XML markup language to gtk.TextTag's and vice versa.
     
+    Based on 'gourmet-0.13.3', http://grecipe-manager.sourceforge.net/
+    
     """
     texttag_to_xml = {
         'weight700': 'b',
@@ -421,10 +429,10 @@ class EditorBuffer(MarkupBuffer):
     """An interactive interface to allow markup a gtk.TextBuffer.
 
     normal_button is a widget whose clicked signal will make us normal
-    toggle_widget_alist is a list that looks like this:
-    [(widget, (font,attr)),
-    (widget2, (font,attr))]
+    toggle_widget_alist is a list that looks like this: [(widget, tag_name),]
 
+    Based on 'gourmet-0.13.3', http://grecipe-manager.sourceforge.net/
+    
     """
     __gtype_name__ = 'EditorBuffer'
 
@@ -435,8 +443,8 @@ class EditorBuffer(MarkupBuffer):
         self.tag_widgets = {}
         self.internal_toggle = False
         self.insert = self.get_insert()
-        for w, tup in toggle_widget_alist:
-            self.setup_widget(w, *tup)
+        for widg, name in toggle_widget_alist:
+            self.setup_widget(widg, name)
 
     # Virtual methods