Added parishes to places, fixed several things from pychecker

svn: r537

gramps/src/Date.py

@@ -112,7 +112,7 @@ class Date:
         return compare_dates(self,other) < 0
 
     def equal_to(self,other):
-        return compare_dates(other) == 0
+        return compare_dates(self,other) == 0
 
     #--------------------------------------------------------------------
     #

gramps/src/EditPlace.py

@@ -76,6 +76,7 @@ class EditPlace:
         self.gallery = ImageSelect.Gallery(place, self.path, idval, plwidget, db)
         self.title = self.top_window.get_widget("place_title")
         self.city = self.top_window.get_widget("city")
+        self.parish = self.top_window.get_widget("parish")
         self.county = self.top_window.get_widget("county")
         self.state = self.top_window.get_widget("state")
         self.country = self.top_window.get_widget("country")
@@ -92,6 +93,7 @@ class EditPlace:
         self.loc_city = self.top_window.get_widget("loc_city")
         self.loc_county = self.top_window.get_widget("loc_county")
         self.loc_state  = self.top_window.get_widget("loc_state")
+        self.loc_parish  = self.top_window.get_widget("loc_parish")
         self.loc_country = self.top_window.get_widget("loc_country")
 
         self.lists_changed = 0
@@ -103,6 +105,7 @@ class EditPlace:
         self.city.set_text(mloc.get_city())
         self.county.set_text(mloc.get_county())
         self.state.set_text(mloc.get_state())
+        self.parish.set_text(mloc.get_parish())
         self.country.set_text(mloc.get_country())
         self.longitude.set_text(place.get_longitude())
         self.latitude.set_text(place.get_latitude())
@@ -138,6 +141,7 @@ class EditPlace:
         # Typing CR selects OK button
         self.top.editable_enters(self.title);
         self.top.editable_enters(self.city);
+        self.top.editable_enters(self.parish);
         self.top.editable_enters(self.county);
         self.top.editable_enters(self.state);
         self.top.editable_enters(self.country);
@@ -183,6 +187,7 @@ class EditPlace:
         city = self.city.get_text()
         county = self.county.get_text()
         state = self.state.get_text()
+        parish = self.parish.get_text()
         country = self.country.get_text()
         longitude = self.longitude.get_text()
         latitude = self.latitude.get_text()
@@ -193,6 +198,10 @@ class EditPlace:
             mloc.set_city(city)
             utils.modified()
 
+        if parish != mloc.get_parish():
+            mloc.set_parish(parish)
+            utils.modified()
+
         if self.lists_changed:
             self.place.setSourceRefList(self.srcreflist)
             utils.modified()
@@ -297,6 +306,7 @@ class EditPlace:
         self.loc_city.set_text(loc.get_city())
         self.loc_county.set_text(loc.get_county())
         self.loc_state.set_text(loc.get_state())
+        self.loc_parish.set_text(loc.get_parish())
         self.loc_country.set_text(loc.get_country())
 
     def display_references(self):

gramps/src/EditSource.py

@@ -153,7 +153,7 @@ class EditSource:
             for v in p.getEventList():
                 for sref in v.getSourceRefList():
                     if sref.getBase() == self.source:
-                        f_event_list.append((n,v.getName()))
+                        f_event_list.append((name,v.getName()))
             for v in p.getAttributeList():
                 for sref in v.getSourceRefList():
                     if sref.getBase() == self.source:
@@ -188,7 +188,7 @@ class EditSource:
         if len(m_list) > 0:
             add(_("Media Objects"))
             add("\n-----------------------------\n")
-            for p in m_event_list:
+            for p in m_list:
                 add("%s\n" % m)
         if len(m_list) > 0:
             add(_("Places"))

gramps/src/GrampsParser.py

@@ -180,6 +180,8 @@ class GrampsParser(handler.ContentHandler):
         loc = Location()
         if attrs.has_key('city'):
             loc.set_city(u2l(attrs['city']))
+        if attrs.has_key('parish'):
+            loc.set_parish(u2l(attrs['parish']))
         if attrs.has_key('state'):
             loc.set_state(u2l(attrs['state']))
         if attrs.has_key('county'):
@@ -1204,11 +1206,14 @@ def build_place_title(loc):
     state = loc.get_state()
     country = loc.get_country()
     county = loc.get_county()
+    parish = loc.get_parish()
     
     value = ""
 
+    if parish:
+        value = parish
     if city:
-        value = city
+        value = append_value(value,city)
     if county:
         value = append_value(value,county)
     if state:

gramps/src/LocEdit.py

@@ -62,11 +62,13 @@ class LocationEditor:
         self.window = self.top.get_widget("loc_edit")
         self.city   = self.top.get_widget("city")
         self.state  = self.top.get_widget("state")
+        self.parish = self.top.get_widget("parish")
         self.county = self.top.get_widget("county")
         self.country = self.top.get_widget("country")
 
         # Typing CR selects OK button
         self.window.editable_enters(self.city);
+        self.window.editable_enters(self.parish);
         self.window.editable_enters(self.county);
         self.window.editable_enters(self.state);
         self.window.editable_enters(self.country);
@@ -83,6 +85,7 @@ class LocationEditor:
             self.county.set_text(location.get_county())
             self.country.set_text(location.get_country())
             self.state.set_text(location.get_state())
+            self.parish.set_text(location.get_parish())
 
         self.window.set_data("o",self)
         self.top.signal_autoconnect({
@@ -97,21 +100,26 @@ class LocationEditor:
         county = self.county.get_text()
         country = self.country.get_text()
         state = self.state.get_text()
+        parish = self.parish.get_text()
         
         if self.location == None:
             self.location = Location()
             self.parent.llist.append(self.location)
         
-        self.update_location(city,county,state,country)
+        self.update_location(city,parish,county,state,country)
         
         self.parent.redraw_location_list()
         utils.destroy_passed_object(obj)
 
-    def update_location(self,city,county,state,country):
+    def update_location(self,city,parish,county,state,country):
         if self.location.get_city() != city:
             self.location.set_city(city)
             self.parent.lists_changed = 1
 
+        if self.location.get_parish() != parish:
+            self.location.set_parish(parish)
+            self.parent.lists_changed = 1
+
         if self.location.get_county() != county:
             self.location.set_county(county)
             self.parent.lists_changed = 1

gramps/src/MediaView.py

@@ -29,6 +29,7 @@ from RelLib import *
 import intl
 import utils
 import const
+import os
 
 _ = intl.gettext
 
@@ -127,10 +128,9 @@ class MediaView:
             index = self.media_list.selection[0]
         mobj = self.media_list.get_row_data(index)
         if self.is_media_object_used(mobj):
-            import ImageSelect
+            ans = ImageSelect.DeleteMediaQuery(mobj,self.db,self.update)
-            ans = ImageSelect.DeleteMediaQuery(mobj,database,self.update)
             msg = _("This media object is currently being used. Delete anyway?")
-            GnomeQuestionDialog(msg,ans.query_response)
+            gnome.ui.GnomeQuestionDialog(msg,ans.query_response)
         else:
             map = self.db.getObjectMap()
             del map[mobj.getId()]
@@ -177,9 +177,9 @@ class MediaView:
                 photo.setDescription(description)
                 self.db.addObject(photo)
                 utils.modified()
-                w.drag_finish(context, TRUE, FALSE, time)
+                w.drag_finish(context, 1, 0, time)
                 self.load_media()
             else:
-                w.drag_finish(context, FALSE, FALSE, time)
+                w.drag_finish(context, 0, 0, time)
 
     

gramps/src/PlaceView.py

@@ -26,6 +26,7 @@ import string
 
 from RelLib import *
 import EditPlace
+import utils
 import intl
 
 _ = intl.gettext
@@ -38,24 +39,27 @@ class PlaceView:
         self.place_arrow   = glade.get_widget("place_arrow")
         self.place_id_arrow= glade.get_widget("place_id_arrow")
         self.city_arrow    = glade.get_widget("city_arrow")
+        self.parish_arrow  = glade.get_widget("parish_arrow")
         self.county_arrow  = glade.get_widget("county_arrow")
         self.state_arrow   = glade.get_widget("state_arrow")
         self.country_arrow = glade.get_widget("country_arrow")
         self.update_display= update
 
-        self.place_arrows = [ self.place_arrow, self.place_id_arrow, self.city_arrow,
+        self.place_arrows = [ self.place_arrow, self.place_id_arrow, self.parish_arrow,
-                              self.county_arrow, self.state_arrow, self.country_arrow ]
+                              self.city_arrow, self.county_arrow, self.state_arrow,
+                              self.country_arrow ]
 
         self.sort_column = 0
         self.sort_direct = GTK.SORT_ASCENDING
 
-        self.place_list.set_column_visibility(6,0)
         self.place_list.set_column_visibility(7,0)
         self.place_list.set_column_visibility(8,0)
         self.place_list.set_column_visibility(9,0)
         self.place_list.set_column_visibility(10,0)
         self.place_list.set_column_visibility(11,0)
-        self.place_list.set_sort_column(self.sort_column+6)
+        self.place_list.set_column_visibility(12,0)
+        self.place_list.set_column_visibility(13,0)
+        self.place_list.set_sort_column(self.sort_column+7)
         self.place_list.set_sort_type(self.sort_direct)
 
     def load_places(self):
@@ -78,10 +82,11 @@ class PlaceView:
             city = mloc.get_city()
             county = mloc.get_county()
             state = mloc.get_state()
+            parish = mloc.get_parish()
             country = mloc.get_country()
-            self.place_list.append([title,id,city,county,state,country,
+            self.place_list.append([title,id,parish,city,county,state,country,
-                                    u(title), u(id), u(city), u(county),
+                                    u(title), u(id), u(parish), u(city),
-                                    u(state), u(country)])
+                                    u(county),u(state), u(country)])
             self.place_list.set_row_data(index,src)
             index = index + 1
 
@@ -108,7 +113,7 @@ class PlaceView:
             if len(obj.selection) > 0:
                 index = obj.selection[0]
                 place = obj.get_row_data(index)
-                EditPlace.EditPlace(place,self.db,update_display_after_edit)
+                EditPlace.EditPlace(place,self.db,self.update_display_after_edit)
 
     def on_click_column(self,obj,column):
         obj.freeze()
@@ -132,7 +137,7 @@ class PlaceView:
             arrow.set(GTK.ARROW_DOWN,2)
         self.sort_column = column
         self.place_list.set_sort_type(self.sort_direct)
-        self.place_list.set_sort_column(self.sort_column + 6)
+        self.place_list.set_sort_column(self.sort_column + 7)
         arrow.show()
         self.place_list.sort()
         if sel:

gramps/src/RelLib.py

@@ -287,11 +287,13 @@ class Location:
         """creates a Location object, copying from the source object if it exists"""
         if source:
             self.city = source.city
+            self.parish = source.parish
             self.county = source.county
             self.state = source.state
             self.country = source.country
         else:
             self.city = ""
+            self.parish = ""
             self.county = ""
             self.state = ""
             self.country = ""
@@ -307,6 +309,14 @@ class Location:
         """returns the city name of the Location object"""
         return self.city
 
+    def set_parish(self,data):
+        """sets the religious parish name"""
+        self.parish = data
+
+    def get_parish(self):
+        """gets the religious parish name"""
+        return self.parish
+
     def set_county(self,data):
         """sets the county name of the Location object"""
         self.county = data

gramps/src/SourceView.py

@@ -63,14 +63,12 @@ class SourceView:
             if len(obj.selection) > 0:
                 index = obj.selection[0]
                 source = obj.get_row_data(index)
-                EditSource.EditSource(source,self.db,update_display_after_edit)
+                EditSource.EditSource(source,self.db,self.update_display_after_edit)
 
     def on_add_source_clicked(self,obj):
         EditSource.EditSource(Source(),self.db,self.new_source_after_edit)
 
     def on_delete_source_clicked(self,obj):
-        import EditSource
-    
         if len(obj.selection) == 0:
             return
         else:
@@ -80,8 +78,8 @@ class SourceView:
 
         if self.is_source_used(source):
             msg = _("This source is currently being used. Delete anyway?")
-            ans = EditSource.DelSrcQuery(source,database,update_display)
+            ans = EditSource.DelSrcQuery(source,self.db,self.update)
-            GnomeQuestionDialog(msg,ans.query_response)
+            gnome.ui.GnomeQuestionDialog(msg,ans.query_response)
         else:
             map = self.db.getSourceMap()
             del map[source.getId()]

gramps/src/WriteXML.py

@@ -233,6 +233,7 @@ def append_value(orig,val):
 def build_place_title(loc):
     "Builds a title from a location"
     city = fix(loc.get_city())
+    parish = fix(loc.get_parish())
     state = fix(loc.get_state())
     country = fix(loc.get_country())
     county = fix(loc.get_county())
@@ -241,6 +242,8 @@ def build_place_title(loc):
 
     if city:
         value = city
+    if parish:
+        value = append_value(value,parish)
     if county:
         value = append_value(value,county)
     if state:
@@ -252,16 +255,19 @@ def build_place_title(loc):
 def dump_location(g,loc):
     "Writes the location information to the output file"
     city = fix(loc.get_city())
+    parish = fix(loc.get_parish())
     state = fix(loc.get_state())
     country = fix(loc.get_country())
     county = fix(loc.get_county())
 
-    if not city and not state and not county and not country:
+    if not city and not state and not parish and not county and not country:
         return
     
     g.write('      <location')
     if city:
         g.write(' city="%s"' % city)
+    if parish:
+        g.write(' parish="%s"' % parish)
     if county:
         g.write(' county="%s"' % county)
     if state:

gramps/src/dialog.glade

@@ -1032,7 +1032,7 @@
       <widget>
 	<class>GtkTable</class>
 	<name>table23</name>
-	<rows>4</rows>
+	<rows>5</rows>
 	<columns>2</columns>
 	<homogeneous>False</homogeneous>
 	<row_spacing>0</row_spacing>
@@ -1082,8 +1082,8 @@
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>1</right_attach>
-	    <top_attach>1</top_attach>
+	    <top_attach>2</top_attach>
-	    <bottom_attach>2</bottom_attach>
+	    <bottom_attach>3</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>False</xexpand>
@@ -1108,8 +1108,8 @@
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>1</right_attach>
-	    <top_attach>3</top_attach>
+	    <top_attach>4</top_attach>
-	    <bottom_attach>4</bottom_attach>
+	    <bottom_attach>5</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>False</xexpand>
@@ -1134,8 +1134,8 @@
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>1</right_attach>
-	    <top_attach>2</top_attach>
+	    <top_attach>3</top_attach>
-	    <bottom_attach>3</bottom_attach>
+	    <bottom_attach>4</bottom_attach>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>False</xexpand>
@@ -1158,8 +1158,8 @@
 	  <child>
 	    <left_attach>1</left_attach>
 	    <right_attach>2</right_attach>
-	    <top_attach>1</top_attach>
+	    <top_attach>2</top_attach>
-	    <bottom_attach>2</bottom_attach>
+	    <bottom_attach>3</bottom_attach>
 	    <xpad>3</xpad>
 	    <ypad>3</ypad>
 	    <xexpand>True</xexpand>
@@ -1207,8 +1207,8 @@
 	  <child>
 	    <left_attach>1</left_attach>
 	    <right_attach>2</right_attach>
-	    <top_attach>2</top_attach>
+	    <top_attach>3</top_attach>
-	    <bottom_attach>3</bottom_attach>
+	    <bottom_attach>4</bottom_attach>
 	    <xpad>3</xpad>
 	    <ypad>3</ypad>
 	    <xexpand>True</xexpand>
@@ -1231,8 +1231,58 @@
 	  <child>
 	    <left_attach>1</left_attach>
 	    <right_attach>2</right_attach>
-	    <top_attach>3</top_attach>
+	    <top_attach>4</top_attach>
-	    <bottom_attach>4</bottom_attach>
+	    <bottom_attach>5</bottom_attach>
+	    <xpad>3</xpad>
+	    <ypad>3</ypad>
+	    <xexpand>True</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkLabel</class>
+	  <name>label184</name>
+	  <label>Religious Parish</label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>1</xalign>
+	  <yalign>0.5</yalign>
+	  <xpad>5</xpad>
+	  <ypad>8</ypad>
+	  <child>
+	    <left_attach>0</left_attach>
+	    <right_attach>1</right_attach>
+	    <top_attach>1</top_attach>
+	    <bottom_attach>2</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkEntry</class>
+	  <name>parish</name>
+	  <can_focus>True</can_focus>
+	  <editable>True</editable>
+	  <text_visible>True</text_visible>
+	  <text_max_length>0</text_max_length>
+	  <text></text>
+	  <child>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>1</top_attach>
+	    <bottom_attach>2</bottom_attach>
 	    <xpad>3</xpad>
 	    <ypad>3</ypad>
 	    <xexpand>True</xexpand>

gramps/src/gramps.glade

@@ -2587,6 +2587,62 @@
 	      </widget>
 	    </widget>
 
+	    <widget>
+	      <class>GtkHBox</class>
+	      <child_name>CList:title</child_name>
+	      <name>hbox45p</name>
+	      <homogeneous>True</homogeneous>
+	      <spacing>0</spacing>
+
+	      <widget>
+		<class>GtkHBox</class>
+		<name>hbox46</name>
+		<homogeneous>False</homogeneous>
+		<spacing>0</spacing>
+		<child>
+		  <padding>0</padding>
+		  <expand>False</expand>
+		  <fill>False</fill>
+		</child>
+
+		<widget>
+		  <class>GtkLabel</class>
+		  <child_name>CList:title</child_name>
+		  <name>label284p</name>
+		  <label>Parish</label>
+		  <justify>GTK_JUSTIFY_CENTER</justify>
+		  <wrap>False</wrap>
+		  <xalign>0.5</xalign>
+		  <yalign>0.5</yalign>
+		  <xpad>0</xpad>
+		  <ypad>0</ypad>
+		  <child>
+		    <padding>0</padding>
+		    <expand>False</expand>
+		    <fill>False</fill>
+		  </child>
+		</widget>
+
+		<widget>
+		  <class>GtkArrow</class>
+		  <name>parish_arrow</name>
+		  <width>10</width>
+		  <height>10</height>
+		  <visible>False</visible>
+		  <arrow_type>GTK_ARROW_DOWN</arrow_type>
+		  <shadow_type>GTK_SHADOW_OUT</shadow_type>
+		  <xalign>0.5</xalign>
+		  <yalign>0.5</yalign>
+		  <xpad>0</xpad>
+		  <ypad>0</ypad>
+		  <child>
+		    <padding>5</padding>
+		    <expand>False</expand>
+		    <fill>True</fill>
+		  </child>
+		</widget>
+	      </widget>
+	    </widget>
 	    <widget>
 	      <class>GtkHBox</class>
 	      <child_name>CList:title</child_name>
@@ -2828,6 +2884,19 @@
 	      <ypad>0</ypad>
 	    </widget>
 
+	    <widget>
+	      <class>GtkLabel</class>
+	      <child_name>CList:title</child_name>
+	      <name>label276p</name>
+	      <label></label>
+	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <wrap>False</wrap>
+	      <xalign>0.5</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	    </widget>
+
 	    <widget>
 	      <class>GtkLabel</class>
 	      <child_name>CList:title</child_name>

gramps/src/gramps_main.py

@@ -66,14 +66,10 @@ import utils
 import Bookmarks
 import ListColors
 import Config
-import EditSource
 import EditPerson
-import EditPlace
 import Marriage
 import Find
 import VersionControl
-import RelImage
-import ImageSelect
 
 #-------------------------------------------------------------------------
 #
@@ -99,6 +95,7 @@ alt2col       = {}
 pedigree_view = None
 place_view    = None
 media_view    = None
+source_view   = None
 
 bookmarks     = None
 topWindow     = None
@@ -115,8 +112,6 @@ dateArrow     = None
 merge_button  = None
 sort_column   = 5
 sort_direct   = SORT_ASCENDING
-p_sort_column = 0
-p_sort_direct = SORT_ASCENDING
 DataFilter    = Filter.Filter("")
 c_birth_order = 0
 c_name        = 1
@@ -125,6 +120,8 @@ c_birth_date  = 4
 c_details     = 6
 c_sort_column = c_birth_order
 c_sort_direct = SORT_ASCENDING
+cNameArrow    = None
+cDateArrow    = None
 
 #-------------------------------------------------------------------------
 #
@@ -542,7 +539,6 @@ def on_ok_button2_clicked(obj):
 #-------------------------------------------------------------------------
 def save_file(filename,comment):        
     import WriteXML
-    import VersionControl
 
     path = filename
     filename = os.path.normpath(filename)
@@ -1096,7 +1092,7 @@ def on_save_activate(obj):
 def on_save_activate_quit():
     """Saves the file, first prompting for a comment if revision control needs it"""
     if not database.getSavePath():
-        on_save_as_activate(obj)
+        on_save_as_activate(None)
     else:
         if Config.usevc and Config.vc_comment:
             display_comment_box(database.getSavePath())
@@ -1105,7 +1101,6 @@ def on_save_activate_quit():
 
 def display_comment_box(filename):
     """Displays a dialog box, prompting for a revison control comment"""
-    import VersionControl
     VersionControl.RevisionComment(filename,save_file)
     
 #-------------------------------------------------------------------------
@@ -1849,11 +1844,10 @@ def main(arg):
     global pedigree_view, place_view, source_view, media_view
     global database, gtop
     global statusbar,notebook
-    global person_list, source_list, canvas
+    global person_list
     global topWindow, preview, merge_button
     global nameArrow, dateArrow, deathArrow, idArrow
     global cNameArrow, cDateArrow
-#    global mid, mtype, mdesc, mpath, mdetails
     
     rc_parse(const.gtkrcFile)
     database = RelDataBase()

gramps/src/places.glade

@@ -156,7 +156,7 @@
 	<widget>
 	  <class>GtkTable</class>
 	  <name>table19</name>
-	  <rows>8</rows>
+	  <rows>9</rows>
 	  <columns>3</columns>
 	  <homogeneous>False</homogeneous>
 	  <row_spacing>0</row_spacing>
@@ -227,8 +227,8 @@
 	    <child>
 	      <left_attach>0</left_attach>
 	      <right_attach>1</right_attach>
-	      <top_attach>3</top_attach>
+	      <top_attach>4</top_attach>
-	      <bottom_attach>4</bottom_attach>
+	      <bottom_attach>5</bottom_attach>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
 	      <xexpand>False</xexpand>
@@ -253,8 +253,8 @@
 	    <child>
 	      <left_attach>0</left_attach>
 	      <right_attach>1</right_attach>
-	      <top_attach>2</top_attach>
+	      <top_attach>3</top_attach>
-	      <bottom_attach>3</bottom_attach>
+	      <bottom_attach>4</bottom_attach>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
 	      <xexpand>False</xexpand>
@@ -279,8 +279,8 @@
 	    <child>
 	      <left_attach>0</left_attach>
 	      <right_attach>1</right_attach>
-	      <top_attach>4</top_attach>
+	      <top_attach>5</top_attach>
-	      <bottom_attach>5</bottom_attach>
+	      <bottom_attach>6</bottom_attach>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
 	      <xexpand>False</xexpand>
@@ -305,8 +305,8 @@
 	    <child>
 	      <left_attach>0</left_attach>
 	      <right_attach>1</right_attach>
-	      <top_attach>5</top_attach>
+	      <top_attach>6</top_attach>
-	      <bottom_attach>6</bottom_attach>
+	      <bottom_attach>7</bottom_attach>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
 	      <xexpand>False</xexpand>
@@ -331,8 +331,8 @@
 	    <child>
 	      <left_attach>0</left_attach>
 	      <right_attach>1</right_attach>
-	      <top_attach>6</top_attach>
+	      <top_attach>7</top_attach>
-	      <bottom_attach>7</bottom_attach>
+	      <bottom_attach>8</bottom_attach>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
 	      <xexpand>False</xexpand>
@@ -357,8 +357,8 @@
 	    <child>
 	      <left_attach>0</left_attach>
 	      <right_attach>1</right_attach>
-	      <top_attach>7</top_attach>
+	      <top_attach>8</top_attach>
-	      <bottom_attach>8</bottom_attach>
+	      <bottom_attach>9</bottom_attach>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
 	      <xexpand>False</xexpand>
@@ -381,8 +381,8 @@
 	    <child>
 	      <left_attach>1</left_attach>
 	      <right_attach>2</right_attach>
-	      <top_attach>7</top_attach>
+	      <top_attach>8</top_attach>
-	      <bottom_attach>8</bottom_attach>
+	      <bottom_attach>9</bottom_attach>
 	      <xpad>5</xpad>
 	      <ypad>5</ypad>
 	      <xexpand>True</xexpand>
@@ -451,30 +451,6 @@
 	    <text_visible>True</text_visible>
 	    <text_max_length>0</text_max_length>
 	    <text></text>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>3</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
-	      <xpad>5</xpad>
-	      <ypad>5</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>state</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
 	    <child>
 	      <left_attach>1</left_attach>
 	      <right_attach>3</right_attach>
@@ -493,7 +469,7 @@
 
 	  <widget>
 	    <class>GtkEntry</class>
-	    <name>country</name>
+	    <name>state</name>
 	    <can_focus>True</can_focus>
 	    <editable>True</editable>
 	    <text_visible>True</text_visible>
@@ -517,7 +493,7 @@
 
 	  <widget>
 	    <class>GtkEntry</class>
-	    <name>longitude</name>
+	    <name>country</name>
 	    <can_focus>True</can_focus>
 	    <editable>True</editable>
 	    <text_visible>True</text_visible>
@@ -541,7 +517,7 @@
 
 	  <widget>
 	    <class>GtkEntry</class>
-	    <name>latitude</name>
+	    <name>longitude</name>
 	    <can_focus>True</can_focus>
 	    <editable>True</editable>
 	    <text_visible>True</text_visible>
@@ -563,6 +539,30 @@
 	    </child>
 	  </widget>
 
+	  <widget>
+	    <class>GtkEntry</class>
+	    <name>latitude</name>
+	    <can_focus>True</can_focus>
+	    <editable>True</editable>
+	    <text_visible>True</text_visible>
+	    <text_max_length>0</text_max_length>
+	    <text></text>
+	    <child>
+	      <left_attach>1</left_attach>
+	      <right_attach>3</right_attach>
+	      <top_attach>7</top_attach>
+	      <bottom_attach>8</bottom_attach>
+	      <xpad>5</xpad>
+	      <ypad>5</ypad>
+	      <xexpand>True</xexpand>
+	      <yexpand>False</yexpand>
+	      <xshrink>False</xshrink>
+	      <yshrink>False</yshrink>
+	      <xfill>True</xfill>
+	      <yfill>False</yfill>
+	    </child>
+	  </widget>
+
 	  <widget>
 	    <class>GtkButton</class>
 	    <name>button119</name>
@@ -578,8 +578,8 @@
 	    <child>
 	      <left_attach>2</left_attach>
 	      <right_attach>3</right_attach>
-	      <top_attach>7</top_attach>
+	      <top_attach>8</top_attach>
-	      <bottom_attach>8</bottom_attach>
+	      <bottom_attach>9</bottom_attach>
 	      <xpad>5</xpad>
 	      <ypad>0</ypad>
 	      <xexpand>False</xexpand>
@@ -590,6 +590,56 @@
 	      <yfill>False</yfill>
 	    </child>
 	  </widget>
+
+	  <widget>
+	    <class>GtkLabel</class>
+	    <name>label279</name>
+	    <label>Religious Parish</label>
+	    <justify>GTK_JUSTIFY_CENTER</justify>
+	    <wrap>False</wrap>
+	    <xalign>1</xalign>
+	    <yalign>0.5</yalign>
+	    <xpad>5</xpad>
+	    <ypad>0</ypad>
+	    <child>
+	      <left_attach>0</left_attach>
+	      <right_attach>1</right_attach>
+	      <top_attach>2</top_attach>
+	      <bottom_attach>3</bottom_attach>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	      <xexpand>False</xexpand>
+	      <yexpand>False</yexpand>
+	      <xshrink>False</xshrink>
+	      <yshrink>False</yshrink>
+	      <xfill>True</xfill>
+	      <yfill>False</yfill>
+	    </child>
+	  </widget>
+
+	  <widget>
+	    <class>GtkEntry</class>
+	    <name>parish</name>
+	    <can_focus>True</can_focus>
+	    <editable>True</editable>
+	    <text_visible>True</text_visible>
+	    <text_max_length>0</text_max_length>
+	    <text></text>
+	    <child>
+	      <left_attach>1</left_attach>
+	      <right_attach>3</right_attach>
+	      <top_attach>2</top_attach>
+	      <bottom_attach>3</bottom_attach>
+	      <xpad>5</xpad>
+	      <ypad>5</ypad>
+	      <xexpand>True</xexpand>
+	      <yexpand>False</yexpand>
+	      <xshrink>False</xshrink>
+	      <yshrink>False</yshrink>
+	      <xfill>True</xfill>
+	      <yfill>False</yfill>
+	    </child>
+	  </widget>
 	</widget>
 
 	<widget>
@@ -627,7 +677,7 @@
 	    <widget>
 	      <class>GtkTable</class>
 	      <name>table21</name>
-	      <rows>4</rows>
+	      <rows>5</rows>
 	      <columns>3</columns>
 	      <homogeneous>False</homogeneous>
 	      <row_spacing>0</row_spacing>
@@ -646,8 +696,8 @@
 		<child>
 		  <left_attach>0</left_attach>
 		  <right_attach>1</right_attach>
-		  <top_attach>1</top_attach>
+		  <top_attach>2</top_attach>
-		  <bottom_attach>2</bottom_attach>
+		  <bottom_attach>3</bottom_attach>
 		  <xpad>0</xpad>
 		  <ypad>0</ypad>
 		  <xexpand>False</xexpand>
@@ -698,8 +748,8 @@
 		<child>
 		  <left_attach>2</left_attach>
 		  <right_attach>3</right_attach>
-		  <top_attach>1</top_attach>
+		  <top_attach>2</top_attach>
-		  <bottom_attach>2</bottom_attach>
+		  <bottom_attach>3</bottom_attach>
 		  <xpad>3</xpad>
 		  <ypad>3</ypad>
 		  <xexpand>False</xexpand>
@@ -724,8 +774,8 @@
 		<child>
 		  <left_attach>0</left_attach>
 		  <right_attach>1</right_attach>
-		  <top_attach>2</top_attach>
+		  <top_attach>3</top_attach>
-		  <bottom_attach>3</bottom_attach>
+		  <bottom_attach>4</bottom_attach>
 		  <xpad>0</xpad>
 		  <ypad>0</ypad>
 		  <xexpand>False</xexpand>
@@ -750,8 +800,8 @@
 		<child>
 		  <left_attach>0</left_attach>
 		  <right_attach>1</right_attach>
-		  <top_attach>3</top_attach>
+		  <top_attach>4</top_attach>
-		  <bottom_attach>4</bottom_attach>
+		  <bottom_attach>5</bottom_attach>
 		  <xpad>0</xpad>
 		  <ypad>0</ypad>
 		  <xexpand>False</xexpand>
@@ -776,8 +826,8 @@
 		<child>
 		  <left_attach>2</left_attach>
 		  <right_attach>3</right_attach>
-		  <top_attach>2</top_attach>
+		  <top_attach>3</top_attach>
-		  <bottom_attach>3</bottom_attach>
+		  <bottom_attach>4</bottom_attach>
 		  <xpad>3</xpad>
 		  <ypad>3</ypad>
 		  <xexpand>False</xexpand>
@@ -802,8 +852,8 @@
 		<child>
 		  <left_attach>2</left_attach>
 		  <right_attach>3</right_attach>
-		  <top_attach>3</top_attach>
+		  <top_attach>4</top_attach>
-		  <bottom_attach>4</bottom_attach>
+		  <bottom_attach>5</bottom_attach>
 		  <xpad>3</xpad>
 		  <ypad>3</ypad>
 		  <xexpand>False</xexpand>
@@ -854,8 +904,8 @@
 		<child>
 		  <left_attach>1</left_attach>
 		  <right_attach>2</right_attach>
-		  <top_attach>1</top_attach>
+		  <top_attach>2</top_attach>
-		  <bottom_attach>2</bottom_attach>
+		  <bottom_attach>3</bottom_attach>
 		  <xpad>0</xpad>
 		  <ypad>0</ypad>
 		  <xexpand>False</xexpand>
@@ -880,8 +930,8 @@
 		<child>
 		  <left_attach>1</left_attach>
 		  <right_attach>2</right_attach>
-		  <top_attach>2</top_attach>
+		  <top_attach>3</top_attach>
-		  <bottom_attach>3</bottom_attach>
+		  <bottom_attach>4</bottom_attach>
 		  <xpad>0</xpad>
 		  <ypad>0</ypad>
 		  <xexpand>False</xexpand>
@@ -906,8 +956,8 @@
 		<child>
 		  <left_attach>1</left_attach>
 		  <right_attach>2</right_attach>
-		  <top_attach>3</top_attach>
+		  <top_attach>4</top_attach>
-		  <bottom_attach>4</bottom_attach>
+		  <bottom_attach>5</bottom_attach>
 		  <xpad>0</xpad>
 		  <ypad>0</ypad>
 		  <xexpand>False</xexpand>
@@ -944,6 +994,84 @@
 		  <yfill>False</yfill>
 		</child>
 	      </widget>
+
+	      <widget>
+		<class>GtkLabel</class>
+		<name>label280</name>
+		<label>Religious Parish</label>
+		<justify>GTK_JUSTIFY_CENTER</justify>
+		<wrap>False</wrap>
+		<xalign>1</xalign>
+		<yalign>0.5</yalign>
+		<xpad>5</xpad>
+		<ypad>0</ypad>
+		<child>
+		  <left_attach>0</left_attach>
+		  <right_attach>1</right_attach>
+		  <top_attach>1</top_attach>
+		  <bottom_attach>2</bottom_attach>
+		  <xpad>0</xpad>
+		  <ypad>0</ypad>
+		  <xexpand>False</xexpand>
+		  <yexpand>False</yexpand>
+		  <xshrink>False</xshrink>
+		  <yshrink>False</yshrink>
+		  <xfill>True</xfill>
+		  <yfill>False</yfill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkLabel</class>
+		<name>label281</name>
+		<label>:</label>
+		<justify>GTK_JUSTIFY_CENTER</justify>
+		<wrap>False</wrap>
+		<xalign>0</xalign>
+		<yalign>0.5</yalign>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<child>
+		  <left_attach>1</left_attach>
+		  <right_attach>2</right_attach>
+		  <top_attach>1</top_attach>
+		  <bottom_attach>2</bottom_attach>
+		  <xpad>0</xpad>
+		  <ypad>0</ypad>
+		  <xexpand>False</xexpand>
+		  <yexpand>False</yexpand>
+		  <xshrink>False</xshrink>
+		  <yshrink>False</yshrink>
+		  <xfill>True</xfill>
+		  <yfill>False</yfill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkLabel</class>
+		<name>loc_parish</name>
+		<label></label>
+		<justify>GTK_JUSTIFY_LEFT</justify>
+		<wrap>False</wrap>
+		<xalign>0</xalign>
+		<yalign>0.5</yalign>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<child>
+		  <left_attach>2</left_attach>
+		  <right_attach>3</right_attach>
+		  <top_attach>1</top_attach>
+		  <bottom_attach>2</bottom_attach>
+		  <xpad>3</xpad>
+		  <ypad>3</ypad>
+		  <xexpand>False</xexpand>
+		  <yexpand>False</yexpand>
+		  <xshrink>False</xshrink>
+		  <yshrink>False</yshrink>
+		  <xfill>True</xfill>
+		  <yfill>False</yfill>
+		</child>
+	      </widget>
 	    </widget>
 	  </widget>