From dfa1a99ba4b3674b876e94aaf3190a5a84b171b3 Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Tue, 5 Nov 2002 04:15:04 +0000
Subject: [PATCH] Media gallery improvements

svn: r1165
---
 gramps2/src/ImageSelect.py      |  3 +--
 gramps2/src/MediaView.py        |  1 -
 gramps2/src/Utils.py            | 12 +-----------
 gramps2/src/plugins/EventCmp.py |  6 +++---
 gramps2/src/soundex.py          |  5 +++--
 5 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/gramps2/src/ImageSelect.py b/gramps2/src/ImageSelect.py
index 236fa62cd..b629126c9 100644
--- a/gramps2/src/ImageSelect.py
+++ b/gramps2/src/ImageSelect.py
@@ -845,8 +845,7 @@ class GlobalMediaProperties:
 #
 #-------------------------------------------------------------------------
 def disp_attr(attr):
-    detail = Utils.get_detail_flags(attr)
-    return [const.display_pattr(attr.getType()),attr.getValue(),detail]
+    return [const.display_pattr(attr.getType()),attr.getValue(),'']
 
 
 class DeleteMediaQuery:
diff --git a/gramps2/src/MediaView.py b/gramps2/src/MediaView.py
index b6f968866..0ea173394 100644
--- a/gramps2/src/MediaView.py
+++ b/gramps2/src/MediaView.py
@@ -209,7 +209,6 @@ class MediaView:
                 path = "<local copy>"
             else:
                 path = src.getPath()
-            details = Utils.get_detail_flags(src,0)
             stitle = string.upper(title)
 
             iter = self.model.append()
diff --git a/gramps2/src/Utils.py b/gramps2/src/Utils.py
index 09ebecb77..e95432e50 100644
--- a/gramps2/src/Utils.py
+++ b/gramps2/src/Utils.py
@@ -164,17 +164,7 @@ def destroy_passed_object(obj):
 #
 #-------------------------------------------------------------------------
 def get_detail_flags(obj,priv=1):
-    import GrampsCfg
-    
-    detail = ""
-    if GrampsCfg.show_detail:
-        if obj.getNote() != "":
-            detail = "N"
-        if len(obj.getSourceRefList()) > 0:
-            detail = detail + "S"
-        if priv and obj.getPrivacy():
-            detail = detail + "P"
-    return detail
+    return ""
 
 #-------------------------------------------------------------------------
 #
diff --git a/gramps2/src/plugins/EventCmp.py b/gramps2/src/plugins/EventCmp.py
index 2b72beffe..7fd38b2a8 100644
--- a/gramps2/src/plugins/EventCmp.py
+++ b/gramps2/src/plugins/EventCmp.py
@@ -118,7 +118,7 @@ class EventComparison:
         self.glade_file = base + os.sep + "eventcmp.glade"
         self.qual = 0
 
-        self.filterDialog = libglade.GladeXML(self.glade_file,"filters")
+        self.filterDialog = gtk.glade.XML(self.glade_file,"filters")
         self.filterDialog.signal_autoconnect({
             "on_apply_clicked"       : self.on_apply_clicked,
             "destroy_passed_object"  : Utils.destroy_passed_object
@@ -186,7 +186,7 @@ class DisplayChart:
         base = os.path.dirname(__file__)
         self.glade_file = base + os.sep + "eventcmp.glade"
 
-        self.topDialog = libglade.GladeXML(self.glade_file,"view")
+        self.topDialog = gtk.glade.XML(self.glade_file,"view")
         self.topDialog.signal_autoconnect({
             "on_write_table"        : self.on_write_table,
             "destroy_passed_object" : Utils.destroy_passed_object
@@ -286,7 +286,7 @@ class DisplayChart:
         return [_("Person"),_("Birth"),_("Death")] + sort_list
 
     def on_write_table(self,obj):
-        self.form = libglade.GladeXML(self.glade_file,"dialog1")
+        self.form = gtk.glade.XML(self.glade_file,"dialog1")
         self.form.signal_autoconnect({
             "on_save_clicked"       : self.on_save_clicked,
             "on_html_toggled"       : self.on_html_toggled,
diff --git a/gramps2/src/soundex.py b/gramps2/src/soundex.py
index 139ab07f3..1b41de173 100644
--- a/gramps2/src/soundex.py
+++ b/gramps2/src/soundex.py
@@ -42,11 +42,12 @@ TABLE  = string.maketrans('ABCDEFGHIJKLMNOPQRSTUVWXYZ',
 def soundex(str):
     "Return the soundex value to a string argument."
 
-    str = string.strip(string.upper(str))
+    str = str.upper().strip()
     if not str:
 	return "Z000"
+    str = str.encode('iso-8859-1')
     str2 = str[0]
-    str = string.translate(str, TABLE, IGNORE)
+    str = str.translate(TABLE, IGNORE)
     if not str:
         return "Z000"
     prev = str[0]