Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed merging

Browse Source 
svn: r775
This commit is contained in:
Don Allingham
2002-02-16 16:05:18 +00:00
parent a0a3d586b9
commit 813afd9f4c
4 changed files with 398 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/MergeData.py
View File

@@ -36,11 +36,12 @@ import libglade
#-------------------------------------------------------------------------
class MergePeople:
def __init__(self,db,person1,person2,update):
def __init__(self,db,person1,person2,update,ep_update=None):
self.db = db
self.p1 = person1
self.p2 = person2
self.update = update
self.ep_update = ep_update
self.glade = libglade.GladeXML(const.mergeFile,"merge")
self.top = self.glade.get_widget("merge")
@@ -91,11 +92,8 @@ class MergePeople:
father2 = ""
mother2 = ""
label1 = "%s (%s)" % (_("First Person"),person1.getId())
label2 = "%s (%s)" % (_("Second Person"),person2.getId())
self.glade.get_widget("PersonFrame1").set_label(label1)
self.glade.get_widget("PersonFrame2").set_label(label2)
self.glade.get_widget("id1_text").set_text(person1.getId())
self.glade.get_widget("id2_text").set_text(person2.getId())
self.glade.get_widget("name1_text").set_text(name1)
self.glade.get_widget("name1_text").set_position(0)
self.glade.get_widget("name2_text").set_text(name2)
@@ -211,7 +209,8 @@ class MergePeople:
def on_merge_edit_clicked(self,obj):
import EditPerson
self.on_merge_clicked(obj)
EditPerson.EditPerson(self.p1,self.db,self.empty)
# This needs to be fixed to provide an update call
EditPerson.EditPerson(self.p1,self.db,self.ep_update)
def copy_note(self,one,two):
if one.getNote() != two.getNote():
@@ -273,6 +272,10 @@ class MergePeople:
else:
self.p1.addUrl(xdata)
self.id2 = self.glade.get_widget("id2")
if self.id2.get_active():
self.p1.setId(self.p2.getId())
if self.bname1.get_active():
if self.altname.get_active():
self.p1.addAlternateName(self.p2.getPrimaryName())

2
src/const.py
View File

@@ -87,7 +87,7 @@ startup = 1
#
#-------------------------------------------------------------------------
progName = "gramps"
version = "0.7.2pre-snap20020202"
version = "0.7.2pre-snap20020216"
copyright = "<EFBFBD> 2001 Donald N. Allingham"
authors = ["Donald N. Allingham", "David Hampton"]
comments = _("GRAMPS (Genealogical Research and Analysis Management Programming System) is a personal genealogy program.")

2
src/gramps_main.py
View File

@@ -185,7 +185,7 @@ def on_merge_activate(obj):
import MergeData
(p1,x) = person_list.get_row_data(person_list.selection[0])
(p2,x) = person_list.get_row_data(person_list.selection[1])
MergeData.MergePeople(database,p1,p2,merge_update)
MergeData.MergePeople(database,p1,p2,merge_update,update_after_edit)
elif page == 4:
place_view.merge()

586
src/mergedata.glade
View File

@@ -430,7 +430,7 @@
<widget>
<class>GtkTable</class>
<name>table3</name>
<rows>12</rows>
<rows>14</rows>
<columns>3</columns>
<homogeneous>False</homogeneous>
<row_spacing>0</row_spacing>
@@ -473,8 +473,8 @@
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<top_attach>4</top_attach>
<bottom_attach>5</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
@@ -499,8 +499,8 @@
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>5</top_attach>
<bottom_attach>6</bottom_attach>
<top_attach>7</top_attach>
<bottom_attach>8</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
@@ -525,8 +525,8 @@
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>9</top_attach>
<bottom_attach>10</bottom_attach>
<top_attach>11</top_attach>
<bottom_attach>12</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
@@ -577,8 +577,8 @@
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>3</top_attach>
<bottom_attach>4</bottom_attach>
<top_attach>5</top_attach>
<bottom_attach>6</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
@@ -603,8 +603,8 @@
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>6</top_attach>
<bottom_attach>7</bottom_attach>
<top_attach>8</top_attach>
<bottom_attach>9</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
@@ -616,30 +616,6 @@
</child>
</widget>
<widget>
<class>GtkEntry</class>
<name>name1_text</name>
<can_focus>True</can_focus>
<editable>False</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>0</top_attach>
<bottom_attach>1</bottom_attach>
<xpad>0</xpad>
<ypad>0</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>birth1_text</name>
@@ -651,8 +627,8 @@
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<top_attach>4</top_attach>
<bottom_attach>5</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
@@ -672,30 +648,6 @@
<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>3</top_attach>
<bottom_attach>4</bottom_attach>
<xpad>0</xpad>
<ypad>0</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>death1_text</name>
<can_focus>True</can_focus>
<editable>False</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>
@@ -714,7 +666,7 @@
<widget>
<class>GtkEntry</class>
<name>dplace1_text</name>
<name>death1_text</name>
<can_focus>True</can_focus>
<editable>False</editable>
<text_visible>True</text_visible>
@@ -723,8 +675,8 @@
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>6</top_attach>
<bottom_attach>7</bottom_attach>
<top_attach>7</top_attach>
<bottom_attach>8</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
@@ -738,7 +690,7 @@
<widget>
<class>GtkEntry</class>
<name>father1</name>
<name>dplace1_text</name>
<can_focus>True</can_focus>
<editable>False</editable>
<text_visible>True</text_visible>
@@ -760,6 +712,30 @@
</child>
</widget>
<widget>
<class>GtkEntry</class>
<name>father1</name>
<can_focus>True</can_focus>
<editable>False</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>10</top_attach>
<bottom_attach>11</bottom_attach>
<xpad>0</xpad>
<ypad>0</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>mother1</name>
@@ -771,8 +747,8 @@
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>9</top_attach>
<bottom_attach>10</bottom_attach>
<top_attach>11</top_attach>
<bottom_attach>12</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
@@ -797,8 +773,8 @@
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>8</top_attach>
<bottom_attach>9</bottom_attach>
<top_attach>10</top_attach>
<bottom_attach>11</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
@@ -816,8 +792,8 @@
<child>
<left_attach>0</left_attach>
<right_attach>3</right_attach>
<top_attach>7</top_attach>
<bottom_attach>8</bottom_attach>
<top_attach>9</top_attach>
<bottom_attach>10</bottom_attach>
<xpad>0</xpad>
<ypad>5</ypad>
<xexpand>False</xexpand>
@@ -835,8 +811,8 @@
<child>
<left_attach>0</left_attach>
<right_attach>3</right_attach>
<top_attach>10</top_attach>
<bottom_attach>11</bottom_attach>
<top_attach>12</top_attach>
<bottom_attach>13</bottom_attach>
<xpad>0</xpad>
<ypad>5</ypad>
<xexpand>False</xexpand>
@@ -858,8 +834,8 @@
<child>
<left_attach>1</left_attach>
<right_attach>3</right_attach>
<top_attach>11</top_attach>
<bottom_attach>12</bottom_attach>
<top_attach>13</top_attach>
<bottom_attach>14</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
@@ -908,8 +884,8 @@
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>11</top_attach>
<bottom_attach>12</bottom_attach>
<top_attach>13</top_attach>
<bottom_attach>14</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
@@ -927,8 +903,8 @@
<child>
<left_attach>0</left_attach>
<right_attach>3</right_attach>
<top_attach>4</top_attach>
<bottom_attach>5</bottom_attach>
<top_attach>6</top_attach>
<bottom_attach>7</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
@@ -946,8 +922,8 @@
<child>
<left_attach>0</left_attach>
<right_attach>3</right_attach>
<top_attach>1</top_attach>
<bottom_attach>2</bottom_attach>
<top_attach>3</top_attach>
<bottom_attach>4</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
@@ -970,8 +946,8 @@
<child>
<left_attach>2</left_attach>
<right_attach>3</right_attach>
<top_attach>8</top_attach>
<bottom_attach>10</bottom_attach>
<top_attach>10</top_attach>
<bottom_attach>12</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
@@ -994,8 +970,8 @@
<child>
<left_attach>2</left_attach>
<right_attach>3</right_attach>
<top_attach>5</top_attach>
<bottom_attach>7</bottom_attach>
<top_attach>7</top_attach>
<bottom_attach>9</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
@@ -1018,8 +994,8 @@
<child>
<left_attach>2</left_attach>
<right_attach>3</right_attach>
<top_attach>2</top_attach>
<bottom_attach>4</bottom_attach>
<top_attach>4</top_attach>
<bottom_attach>6</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
@@ -1030,6 +1006,123 @@
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>label57</name>
<label>ID</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>id1_text</name>
<can_focus>True</can_focus>
<editable>False</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>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</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>name1_text</name>
<can_focus>True</can_focus>
<editable>False</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>0</top_attach>
<bottom_attach>1</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkRadioButton</class>
<name>id1</name>
<can_focus>True</can_focus>
<label></label>
<active>False</active>
<draw_indicator>True</draw_indicator>
<group>id</group>
<child>
<left_attach>2</left_attach>
<right_attach>3</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>GtkHSeparator</class>
<name>hseparator11</name>
<child>
<left_attach>0</left_attach>
<right_attach>3</right_attach>
<top_attach>1</top_attach>
<bottom_attach>2</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>True</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>True</yfill>
</child>
</widget>
</widget>
</widget>
@@ -1049,36 +1142,12 @@
<widget>
<class>GtkTable</class>
<name>table4</name>
<rows>12</rows>
<rows>14</rows>
<columns>3</columns>
<homogeneous>False</homogeneous>
<row_spacing>0</row_spacing>
<column_spacing>2</column_spacing>
<widget>
<class>GtkRadioButton</class>
<name>bname2</name>
<can_focus>True</can_focus>
<label></label>
<active>False</active>
<draw_indicator>True</draw_indicator>
<group>name</group>
<child>
<left_attach>2</left_attach>
<right_attach>3</right_attach>
<top_attach>0</top_attach>
<bottom_attach>1</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>True</xshrink>
<yshrink>False</yshrink>
<xfill>False</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>label13</name>
@@ -1092,8 +1161,8 @@
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>5</top_attach>
<bottom_attach>6</bottom_attach>
<top_attach>7</top_attach>
<bottom_attach>8</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
@@ -1118,34 +1187,8 @@
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>9</top_attach>
<bottom_attach>10</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>label5</name>
<label>Name</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>0</top_attach>
<bottom_attach>1</bottom_attach>
<top_attach>11</top_attach>
<bottom_attach>12</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
@@ -1170,8 +1213,8 @@
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>3</top_attach>
<bottom_attach>4</bottom_attach>
<top_attach>5</top_attach>
<bottom_attach>6</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
@@ -1196,8 +1239,8 @@
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<top_attach>4</top_attach>
<bottom_attach>5</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
@@ -1222,8 +1265,8 @@
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>6</top_attach>
<bottom_attach>7</bottom_attach>
<top_attach>8</top_attach>
<bottom_attach>9</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
@@ -1270,8 +1313,8 @@
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<top_attach>4</top_attach>
<bottom_attach>5</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
@@ -1291,30 +1334,6 @@
<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>3</top_attach>
<bottom_attach>4</bottom_attach>
<xpad>0</xpad>
<ypad>0</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>death2_text</name>
<can_focus>True</can_focus>
<editable>False</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>
@@ -1333,7 +1352,7 @@
<widget>
<class>GtkEntry</class>
<name>dplace2_text</name>
<name>death2_text</name>
<can_focus>True</can_focus>
<editable>False</editable>
<text_visible>True</text_visible>
@@ -1342,8 +1361,8 @@
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>6</top_attach>
<bottom_attach>7</bottom_attach>
<top_attach>7</top_attach>
<bottom_attach>8</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
@@ -1357,7 +1376,7 @@
<widget>
<class>GtkEntry</class>
<name>father2</name>
<name>dplace2_text</name>
<can_focus>True</can_focus>
<editable>False</editable>
<text_visible>True</text_visible>
@@ -1379,6 +1398,30 @@
</child>
</widget>
<widget>
<class>GtkEntry</class>
<name>father2</name>
<can_focus>True</can_focus>
<editable>False</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>10</top_attach>
<bottom_attach>11</bottom_attach>
<xpad>0</xpad>
<ypad>0</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>mother2</name>
@@ -1390,8 +1433,8 @@
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>9</top_attach>
<bottom_attach>10</bottom_attach>
<top_attach>11</top_attach>
<bottom_attach>12</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
@@ -1416,8 +1459,8 @@
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>11</top_attach>
<bottom_attach>12</bottom_attach>
<top_attach>13</top_attach>
<bottom_attach>14</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
@@ -1442,8 +1485,8 @@
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>8</top_attach>
<bottom_attach>9</bottom_attach>
<top_attach>10</top_attach>
<bottom_attach>11</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
@@ -1461,8 +1504,8 @@
<child>
<left_attach>0</left_attach>
<right_attach>3</right_attach>
<top_attach>7</top_attach>
<bottom_attach>8</bottom_attach>
<top_attach>9</top_attach>
<bottom_attach>10</bottom_attach>
<xpad>0</xpad>
<ypad>5</ypad>
<xexpand>False</xexpand>
@@ -1480,8 +1523,8 @@
<child>
<left_attach>0</left_attach>
<right_attach>3</right_attach>
<top_attach>10</top_attach>
<bottom_attach>11</bottom_attach>
<top_attach>12</top_attach>
<bottom_attach>13</bottom_attach>
<xpad>0</xpad>
<ypad>5</ypad>
<xexpand>False</xexpand>
@@ -1503,8 +1546,8 @@
<child>
<left_attach>1</left_attach>
<right_attach>3</right_attach>
<top_attach>11</top_attach>
<bottom_attach>12</bottom_attach>
<top_attach>13</top_attach>
<bottom_attach>14</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
@@ -1546,8 +1589,8 @@
<child>
<left_attach>0</left_attach>
<right_attach>3</right_attach>
<top_attach>1</top_attach>
<bottom_attach>2</bottom_attach>
<top_attach>3</top_attach>
<bottom_attach>4</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
@@ -1565,8 +1608,8 @@
<child>
<left_attach>0</left_attach>
<right_attach>3</right_attach>
<top_attach>4</top_attach>
<bottom_attach>5</bottom_attach>
<top_attach>6</top_attach>
<bottom_attach>7</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
@@ -1589,8 +1632,8 @@
<child>
<left_attach>2</left_attach>
<right_attach>3</right_attach>
<top_attach>2</top_attach>
<bottom_attach>4</bottom_attach>
<top_attach>4</top_attach>
<bottom_attach>6</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
@@ -1613,8 +1656,8 @@
<child>
<left_attach>2</left_attach>
<right_attach>3</right_attach>
<top_attach>5</top_attach>
<bottom_attach>7</bottom_attach>
<top_attach>7</top_attach>
<bottom_attach>9</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
@@ -1637,8 +1680,8 @@
<child>
<left_attach>2</left_attach>
<right_attach>3</right_attach>
<top_attach>8</top_attach>
<bottom_attach>10</bottom_attach>
<top_attach>10</top_attach>
<bottom_attach>12</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
@@ -1649,6 +1692,149 @@
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>label58</name>
<label>Name</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>0</top_attach>
<bottom_attach>1</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>label59</name>
<label>ID</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>id2_text</name>
<can_focus>True</can_focus>
<editable>False</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>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkRadioButton</class>
<name>radiobutton2</name>
<can_focus>True</can_focus>
<label></label>
<active>False</active>
<draw_indicator>True</draw_indicator>
<group>name</group>
<child>
<left_attach>2</left_attach>
<right_attach>3</right_attach>
<top_attach>0</top_attach>
<bottom_attach>1</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>True</xshrink>
<yshrink>False</yshrink>
<xfill>False</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkRadioButton</class>
<name>id2</name>
<can_focus>True</can_focus>
<label></label>
<active>False</active>
<draw_indicator>True</draw_indicator>
<group>id</group>
<child>
<left_attach>2</left_attach>
<right_attach>3</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>GtkHSeparator</class>
<name>hseparator12</name>
<child>
<left_attach>0</left_attach>
<right_attach>3</right_attach>
<top_attach>1</top_attach>
<bottom_attach>2</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>True</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>True</yfill>
</child>
</widget>
</widget>
</widget>
</widget>