From 32d3950455e56493112c171487beecb8fdd511d4 Mon Sep 17 00:00:00 2001
From: Alex Roitman <shura@gramps-project.org>
Date: Thu, 16 Jun 2005 03:46:47 +0000
Subject: [PATCH] * src/ListBox.py (EventListBox.set_place): Fix place setting.

svn: r4830
---
 gramps2/ChangeLog      |  3 +++
 gramps2/src/ListBox.py | 36 ++++++++++++++++++++++++++++--------
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index cbf5edcca..41ebb55f3 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,6 @@
+2005-06-15  Alex Roitman  <shura@gramps-project.org>
+	* src/ListBox.py (EventListBox.set_place): Fix place setting.
+
 2005-06-14  Alex Roitman  <shura@gramps-project.org>
 	* src/events.png, src/repos.png, src/repos24.png: Add GNOME icons
 	for the stock calendar and drawer.
diff --git a/gramps2/src/ListBox.py b/gramps2/src/ListBox.py
index 8e229d846..42b33d497 100644
--- a/gramps2/src/ListBox.py
+++ b/gramps2/src/ListBox.py
@@ -319,15 +319,22 @@ class EventListBox(ReorderListBox):
         rolenames = filter(lambda x: x != role_custom_str,
                            self.role_dict.values())
 
+        self.place_dict = {} 
+        for handle in self.parent.db.get_place_handles():
+            title = self.parent.db.get_place_from_handle(handle).get_title()
+            self.place_dict[title] = handle
+        placenames = self.place_dict.keys()
+        placenames.sort(locale.strcoll)
+        
         evalues = [
             # Title            Sort Col Size, Type    Argument
-            (_('Event'),       NOSORT, 100, COMBO,  eventnames, self.set_type),
-            (_('Description'), NOSORT, 140, TEXT,   None,       self.set_description),
-            (_('Date'),        NOSORT, 100, TEXT,   None,       self.set_date),
-            (_('Place'),       NOSORT, 100, TEXT,   None,       self.set_place),
-            (_('Role'),        NOSORT, 100, COMBO,  rolenames,  self.set_role),
-            (_('Source'),      NOSORT, 50,  TOGGLE, None,       None),
-            (_('Note'),        NOSORT, 50,  TOGGLE, None,       None),
+            (_('Event'),       NOSORT, 100, COMBO,  eventnames,self.set_type),
+            (_('Description'), NOSORT, 140, TEXT,   None,self.set_description),
+            (_('Date'),        NOSORT, 100, TEXT,   None,      self.set_date),
+            (_('Place'),       NOSORT, 100, TEXT,   None,      self.set_place),
+            (_('Role'),        NOSORT, 100, COMBO,  rolenames, self.set_role),
+            (_('Source'),      NOSORT, 50,  TOGGLE, None,      None),
+            (_('Note'),        NOSORT, 50,  TOGGLE, None,      None),
             ]
         
         ReorderListBox.__init__(self, parent, primary, obj, label,
@@ -359,7 +366,20 @@ class EventListBox(ReorderListBox):
         self.change_list.add(self.data[index])
 
     def set_place(self,index,value):
-        self.data[index][1].set_description(value)
+        if not value.strip():
+            return
+        handle = self.place_dict.get(value,None)
+        if handle:
+            place = self.parent.db.get_place_from_handle(handle)
+        else:
+            place = RelLib.Place()
+            place.set_title(value)
+            trans = self.parent.db.transaction_begin()
+            self.parent.db.add_place(place,trans)
+            self.parent.db.transaction_commit(trans,_("Add Place"))
+            handle = place.get_handle()
+        
+        self.data[index][1].set_place_handle(handle)
         self.change_list.add(self.data[index])
 
     def set_date(self,index,value):