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

Fix inline notes

Browse Source 
svn: r110
This commit is contained in:
Don Allingham 2001-06-10 01:26:09 +00:00
parent 0482a14561
commit 6def86b441
9 changed files with 310 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Config.py
View File

@ -88,6 +88,7 @@ _name_format_list = [
owner = Researcher.Researcher() owner = Researcher.Researcher()
autoload = 0 autoload = 0
usetabs = 0 usetabs = 0
show_detail = 0
hide_altnames = 0 hide_altnames = 0
lastfile = None lastfile = None
nameof = utils.normal_name nameof = utils.normal_name
@ -136,6 +137,7 @@ def loadConfig(call):
global autoload global autoload
global owner global owner
global usetabs global usetabs
global show_detail
global hide_altnames global hide_altnames
global lastfile global lastfile
global nameof global nameof
@ -151,6 +153,7 @@ def loadConfig(call):
_callback = call _callback = call
lastfile = gnome.config.get_string("/gramps/data/LastFile") lastfile = gnome.config.get_string("/gramps/data/LastFile")
usetabs = gnome.config.get_bool("/gramps/config/UseTabs") usetabs = gnome.config.get_bool("/gramps/config/UseTabs")
show_detail = gnome.config.get_bool("/gramps/config/ShowDetail")
status_bar = gnome.config.get_int("/gramps/config/StatusBar") status_bar = gnome.config.get_int("/gramps/config/StatusBar")
display_attr = gnome.config.get_bool("/gramps/config/DisplayAttr") display_attr = gnome.config.get_bool("/gramps/config/DisplayAttr")
attr_name = gnome.config.get_string("/gramps/config/DisplayAttrName") attr_name = gnome.config.get_string("/gramps/config/DisplayAttrName")
@ -197,6 +200,8 @@ def loadConfig(call):
autoload = 1 autoload = 1
if usetabs == None: if usetabs == None:
usetabs = 0 usetabs = 0
if show_detail == None:
show_detail = 0
if status_bar == None: if status_bar == None:
status_bar = 0 status_bar = 0
if hide_altnames == None: if hide_altnames == None:
@ -290,10 +295,12 @@ def on_propertybox_apply(obj,page):
global hide_altnames global hide_altnames
global paper_preference global paper_preference
global output_preference global output_preference
global show_detail
if page != -1: if page != -1:
return return
show_detail = prefsTop.get_widget("showdetail").get_active()
autoload = prefsTop.get_widget("autoload").get_active() autoload = prefsTop.get_widget("autoload").get_active()
display_attr = prefsTop.get_widget("attr_display").get_active() display_attr = prefsTop.get_widget("attr_display").get_active()
attr_name = string.strip(prefsTop.get_widget("attr_name").get_text()) attr_name = string.strip(prefsTop.get_widget("attr_name").get_text())
@ -313,6 +320,7 @@ def on_propertybox_apply(obj,page):
output_preference = output_obj.get_data("d") output_preference = output_obj.get_data("d")
gnome.config.set_bool("/gramps/config/UseTabs",usetabs) gnome.config.set_bool("/gramps/config/UseTabs",usetabs)
gnome.config.set_bool("/gramps/config/ShowDetail",show_detail)
gnome.config.set_int("/gramps/config/StatusBar",status_bar) gnome.config.set_int("/gramps/config/StatusBar",status_bar)
gnome.config.set_bool("/gramps/config/DisplayAttr",display_attr) gnome.config.set_bool("/gramps/config/DisplayAttr",display_attr)
gnome.config.set_string("/gramps/config/DisplayAttrName",attr_name) gnome.config.set_string("/gramps/config/DisplayAttrName",attr_name)
@ -445,9 +453,11 @@ def display_preferences_box():
pbox = prefsTop.get_widget("propertybox") pbox = prefsTop.get_widget("propertybox")
auto = prefsTop.get_widget("autoload") auto = prefsTop.get_widget("autoload")
tabs = prefsTop.get_widget("usetabs") tabs = prefsTop.get_widget("usetabs")
detail = prefsTop.get_widget("showdetail")
display_attr_obj = prefsTop.get_widget("attr_display") display_attr_obj = prefsTop.get_widget("attr_display")
display_altnames = prefsTop.get_widget("display_altnames") display_altnames = prefsTop.get_widget("display_altnames")
auto.set_active(autoload) auto.set_active(autoload)
detail.set_active(show_detail)
tabs.set_active(usetabs) tabs.set_active(usetabs)
display_attr_obj.set_active(display_attr) display_attr_obj.set_active(display_attr)

68
src/EditPerson.glade
View File

@ -1200,8 +1200,8 @@
<handler>on_nameList_select_row</handler> <handler>on_nameList_select_row</handler>
<last_modification_time>Mon, 18 Dec 2000 22:29:26 GMT</last_modification_time> <last_modification_time>Mon, 18 Dec 2000 22:29:26 GMT</last_modification_time>
</signal> </signal>
<columns>1</columns> <columns>2</columns>
<column_widths>80</column_widths> <column_widths>450,50</column_widths>
<selection_mode>GTK_SELECTION_SINGLE</selection_mode> <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
<show_titles>True</show_titles> <show_titles>True</show_titles>
<shadow_type>GTK_SHADOW_IN</shadow_type> <shadow_type>GTK_SHADOW_IN</shadow_type>
@ -1218,6 +1218,19 @@
<xpad>0</xpad> <xpad>0</xpad>
<ypad>0</ypad> <ypad>0</ypad>
</widget> </widget>
<widget>
<class>GtkLabel</class>
<child_name>CList:title</child_name>
<name>name_detail</name>
<label>Details</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> </widget>
</widget> </widget>
@ -1636,8 +1649,8 @@
<handler>on_eventList_select_row</handler> <handler>on_eventList_select_row</handler>
<last_modification_time>Fri, 01 Dec 2000 02:58:20 GMT</last_modification_time> <last_modification_time>Fri, 01 Dec 2000 02:58:20 GMT</last_modification_time>
</signal> </signal>
<columns>3</columns> <columns>4</columns>
<column_widths>162,119,80</column_widths> <column_widths>125,150,200,50</column_widths>
<selection_mode>GTK_SELECTION_SINGLE</selection_mode> <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
<show_titles>True</show_titles> <show_titles>True</show_titles>
<shadow_type>GTK_SHADOW_IN</shadow_type> <shadow_type>GTK_SHADOW_IN</shadow_type>
@ -1680,6 +1693,19 @@
<xpad>0</xpad> <xpad>0</xpad>
<ypad>0</ypad> <ypad>0</ypad>
</widget> </widget>
<widget>
<class>GtkLabel</class>
<child_name>CList:title</child_name>
<name>event_details</name>
<label>Details</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> </widget>
</widget> </widget>
@ -1985,8 +2011,8 @@
<handler>on_attr_list_select_row</handler> <handler>on_attr_list_select_row</handler>
<last_modification_time>Tue, 01 May 2001 17:24:40 GMT</last_modification_time> <last_modification_time>Tue, 01 May 2001 17:24:40 GMT</last_modification_time>
</signal> </signal>
<columns>2</columns> <columns>3</columns>
<column_widths>238,80</column_widths> <column_widths>200,250,50</column_widths>
<selection_mode>GTK_SELECTION_SINGLE</selection_mode> <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
<show_titles>True</show_titles> <show_titles>True</show_titles>
<shadow_type>GTK_SHADOW_IN</shadow_type> <shadow_type>GTK_SHADOW_IN</shadow_type>
@ -2016,6 +2042,19 @@
<xpad>0</xpad> <xpad>0</xpad>
<ypad>0</ypad> <ypad>0</ypad>
</widget> </widget>
<widget>
<class>GtkLabel</class>
<child_name>CList:title</child_name>
<name>attr_details</name>
<label>Details</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> </widget>
</widget> </widget>
@ -2509,8 +2548,8 @@
<handler>on_address_list_select_row</handler> <handler>on_address_list_select_row</handler>
<last_modification_time>Wed, 23 May 2001 18:42:16 GMT</last_modification_time> <last_modification_time>Wed, 23 May 2001 18:42:16 GMT</last_modification_time>
</signal> </signal>
<columns>2</columns> <columns>3</columns>
<column_widths>165,80</column_widths> <column_widths>150,350,50</column_widths>
<selection_mode>GTK_SELECTION_SINGLE</selection_mode> <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
<show_titles>True</show_titles> <show_titles>True</show_titles>
<shadow_type>GTK_SHADOW_IN</shadow_type> <shadow_type>GTK_SHADOW_IN</shadow_type>
@ -2540,6 +2579,19 @@
<xpad>0</xpad> <xpad>0</xpad>
<ypad>0</ypad> <ypad>0</ypad>
</widget> </widget>
<widget>
<class>GtkLabel</class>
<child_name>CList:title</child_name>
<name>address_details</name>
<label>Details</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> </widget>
</widget> </widget>

35
src/EditPerson.py
View File

@ -181,6 +181,11 @@ class EditPerson:
death = person.getDeath() death = person.getDeath()
self.get_widget("gid").set_text(str(person.getId())) self.get_widget("gid").set_text(str(person.getId()))
self.event_list.set_column_visibility(3,Config.show_detail)
self.name_list.set_column_visibility(1,Config.show_detail)
self.attr_list.set_column_visibility(2,Config.show_detail)
self.address_list.set_column_visibility(2,Config.show_detail)
if Config.display_attr: if Config.display_attr:
self.get_widget("user_label").set_text(Config.attr_name) self.get_widget("user_label").set_text(Config.attr_name)
val = "" val = ""
@ -263,7 +268,13 @@ class EditPerson:
self.name_list.clear() self.name_list.clear()
self.name_index = 0 self.name_index = 0
attr = ""
for name in self.person.getAlternateNames(): for name in self.person.getAlternateNames():
if Config.show_detail:
if name.getNote() != "":
attr = "N"
if name.getSourceRef():
attr = attr + "S"
self.name_list.append([name.getName()]) self.name_list.append([name.getName()])
self.name_list.set_row_data(self.name_index,name) self.name_list.set_row_data(self.name_index,name)
self.name_index = self.name_index + 1 self.name_index = self.name_index + 1
@ -317,8 +328,14 @@ class EditPerson:
self.attr_list.clear() self.attr_list.clear()
self.attr_index = 0 self.attr_index = 0
detail = ""
for attr in self.person.getAttributeList(): for attr in self.person.getAttributeList():
self.attr_list.append([attr.getType(),attr.getValue()]) if Config.show_detail:
if attr.getNote() != "":
detail = "N"
if attr.getSourceRef():
detail = detail + "S"
self.attr_list.append([attr.getType(),attr.getValue(),detail])
self.attr_list.set_row_data(self.attr_index,attr) self.attr_list.set_row_data(self.attr_index,attr)
self.attr_index = self.attr_index + 1 self.attr_index = self.attr_index + 1
@ -343,11 +360,17 @@ class EditPerson:
self.address_list.freeze() self.address_list.freeze()
self.address_list.clear() self.address_list.clear()
detail = ""
self.address_index = 0 self.address_index = 0
for address in self.person.getAddressList(): for address in self.person.getAddressList():
if Config.show_detail:
if address.getNote() != "":
detail = "N"
if address.getSourceRef():
detail = detail + "S"
location = address.getCity() + " " + address.getState() + " " + \ location = address.getCity() + " " + address.getState() + " " + \
address.getCountry() address.getCountry()
self.address_list.append([address.getDate(),location]) self.address_list.append([address.getDate(),location,detail])
self.address_list.set_row_data(self.address_index,address) self.address_list.set_row_data(self.address_index,address)
self.address_index = self.address_index + 1 self.address_index = self.address_index + 1
@ -374,9 +397,15 @@ class EditPerson:
self.event_list.clear() self.event_list.clear()
self.event_index = 0 self.event_index = 0
attr = ""
for event in self.person.getEventList(): for event in self.person.getEventList():
if Config.show_detail:
if event.getNote() != "":
attr = "N"
if event.getSourceRef():
attr = attr + "S"
self.event_list.append([event.getName(),event.getQuoteDate(),\ self.event_list.append([event.getName(),event.getQuoteDate(),\
event.getPlace()]) event.getPlace(),attr])
self.event_list.set_row_data(self.event_index,event) self.event_list.set_row_data(self.event_index,event)
self.event_index = self.event_index + 1 self.event_index = self.event_index + 1

19
src/Marriage.py
View File

@ -110,6 +110,9 @@ class Marriage:
self.attr_type = self.get_widget("attr_type") self.attr_type = self.get_widget("attr_type")
self.attr_value = self.get_widget("attr_value") self.attr_value = self.get_widget("attr_value")
self.event_list.set_column_visibility(3,Config.show_detail)
self.attr_list.set_column_visibility(2,Config.show_detail)
# set initial data # set initial data
mevent_list = self.get_widget("marriageEvent") mevent_list = self.get_widget("marriageEvent")
mevent_list.set_popdown_strings(const.marriageEvents) mevent_list.set_popdown_strings(const.marriageEvents)
@ -149,8 +152,14 @@ class Marriage:
self.attr_list.clear() self.attr_list.clear()
self.attr_index = 0 self.attr_index = 0
details = ""
for attr in self.family.getAttributeList(): for attr in self.family.getAttributeList():
self.attr_list.append([attr.getType(),attr.getValue()]) if Config.show_detail:
if attr.getNote() != "":
detail = "N"
if attr.getSourceRef():
detail = detail + "S"
self.attr_list.append([attr.getType(),attr.getValue(),details])
self.attr_list.set_row_data(self.attr_index,attr) self.attr_list.set_row_data(self.attr_index,attr)
self.attr_index = self.attr_index + 1 self.attr_index = self.attr_index + 1
@ -175,7 +184,13 @@ class Marriage:
def add_event(self,text,event): def add_event(self,text,event):
if not event: if not event:
return return
self.event_list.append([text,event.getQuoteDate(),event.getPlace()]) detail = ""
if Config.show_detail:
if event.getNote() != "":
detail = "N"
if event.getSourceRef():
detail = detail + "S"
self.event_list.append([text,event.getQuoteDate(),event.getPlace(),detail])
self.event_list.set_row_data(self.lines,event) self.event_list.set_row_data(self.lines,event)
self.lines = self.lines + 1 self.lines = self.lines + 1

180
src/config.glade
View File

@ -148,35 +148,6 @@
</child> </child>
</widget> </widget>
<widget>
<class>GtkCheckButton</class>
<name>display_altnames</name>
<can_focus>True</can_focus>
<signal>
<name>toggled</name>
<handler>on_object_toggled</handler>
<object>propertybox</object>
<last_modification_time>Sun, 22 Apr 2001 21:20:17 GMT</last_modification_time>
</signal>
<label>Do not display alternate names in person list</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>5</xpad>
<ypad>5</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget> <widget>
<class>GtkCheckButton</class> <class>GtkCheckButton</class>
<name>attr_display</name> <name>attr_display</name>
@ -436,12 +407,104 @@
<widget> <widget>
<class>GtkTable</class> <class>GtkTable</class>
<name>table21</name> <name>table21</name>
<rows>1</rows> <rows>2</rows>
<columns>2</columns> <columns>2</columns>
<homogeneous>False</homogeneous> <homogeneous>False</homogeneous>
<row_spacing>0</row_spacing> <row_spacing>0</row_spacing>
<column_spacing>0</column_spacing> <column_spacing>0</column_spacing>
<widget>
<class>GtkFrame</class>
<name>frame7</name>
<label>Status Bar</label>
<label_xalign>0</label_xalign>
<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>0</top_attach>
<bottom_attach>1</bottom_attach>
<xpad>5</xpad>
<ypad>5</ypad>
<xexpand>True</xexpand>
<yexpand>True</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>True</yfill>
</child>
<widget>
<class>GtkVBox</class>
<name>vbox25</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<widget>
<class>GtkRadioButton</class>
<name>stat1</name>
<can_focus>True</can_focus>
<signal>
<name>toggled</name>
<handler>on_object_toggled</handler>
<object>propertybox</object>
<last_modification_time>Wed, 30 May 2001 02:18:01 GMT</last_modification_time>
</signal>
<label>Active person's name only</label>
<active>True</active>
<draw_indicator>True</draw_indicator>
<group>status</group>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
<widget>
<class>GtkRadioButton</class>
<name>stat2</name>
<can_focus>True</can_focus>
<signal>
<name>toggled</name>
<handler>on_object_toggled</handler>
<object>propertybox</object>
<last_modification_time>Wed, 30 May 2001 02:18:16 GMT</last_modification_time>
</signal>
<label>Active person's name and gramps ID</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
<group>status</group>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
<widget>
<class>GtkRadioButton</class>
<name>stat3</name>
<can_focus>True</can_focus>
<signal>
<name>toggled</name>
<handler>on_object_toggled</handler>
<object>propertybox</object>
<last_modification_time>Wed, 30 May 2001 02:18:29 GMT</last_modification_time>
</signal>
<label>Active person's name and attribute</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
<group>status</group>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
</widget>
</widget>
<widget> <widget>
<class>GtkFrame</class> <class>GtkFrame</class>
<name>frame4</name> <name>frame4</name>
@ -452,7 +515,7 @@
<left_attach>0</left_attach> <left_attach>0</left_attach>
<right_attach>1</right_attach> <right_attach>1</right_attach>
<top_attach>0</top_attach> <top_attach>0</top_attach>
<bottom_attach>1</bottom_attach> <bottom_attach>2</bottom_attach>
<xpad>5</xpad> <xpad>5</xpad>
<ypad>5</ypad> <ypad>5</ypad>
<xexpand>False</xexpand> <xexpand>False</xexpand>
@ -725,19 +788,19 @@
<widget> <widget>
<class>GtkFrame</class> <class>GtkFrame</class>
<name>frame7</name> <name>frame8</name>
<label>Status Bar</label> <label>List display options</label>
<label_xalign>0</label_xalign> <label_xalign>0</label_xalign>
<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type> <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
<child> <child>
<left_attach>1</left_attach> <left_attach>1</left_attach>
<right_attach>2</right_attach> <right_attach>2</right_attach>
<top_attach>0</top_attach> <top_attach>1</top_attach>
<bottom_attach>1</bottom_attach> <bottom_attach>2</bottom_attach>
<xpad>5</xpad> <xpad>5</xpad>
<ypad>5</ypad> <ypad>5</ypad>
<xexpand>True</xexpand> <xexpand>False</xexpand>
<yexpand>True</yexpand> <yexpand>False</yexpand>
<xshrink>False</xshrink> <xshrink>False</xshrink>
<yshrink>False</yshrink> <yshrink>False</yshrink>
<xfill>True</xfill> <xfill>True</xfill>
@ -746,24 +809,23 @@
<widget> <widget>
<class>GtkVBox</class> <class>GtkVBox</class>
<name>vbox25</name> <name>vbox26</name>
<homogeneous>False</homogeneous> <homogeneous>False</homogeneous>
<spacing>0</spacing> <spacing>0</spacing>
<widget> <widget>
<class>GtkRadioButton</class> <class>GtkCheckButton</class>
<name>stat1</name> <name>display_altnames</name>
<can_focus>True</can_focus> <can_focus>True</can_focus>
<signal> <signal>
<name>toggled</name> <name>toggled</name>
<handler>on_object_toggled</handler> <handler>on_object_toggled</handler>
<object>propertybox</object> <object>propertybox</object>
<last_modification_time>Wed, 30 May 2001 02:18:01 GMT</last_modification_time> <last_modification_time>Sun, 22 Apr 2001 21:20:17 GMT</last_modification_time>
</signal> </signal>
<label>Active person's name only</label> <label>Do not display alternate names in person list</label>
<active>True</active> <active>False</active>
<draw_indicator>True</draw_indicator> <draw_indicator>True</draw_indicator>
<group>status</group>
<child> <child>
<padding>0</padding> <padding>0</padding>
<expand>False</expand> <expand>False</expand>
@ -772,40 +834,18 @@
</widget> </widget>
<widget> <widget>
<class>GtkRadioButton</class> <class>GtkCheckButton</class>
<name>stat2</name> <name>showdetail</name>
<can_focus>True</can_focus> <can_focus>True</can_focus>
<signal> <signal>
<name>toggled</name> <name>toggled</name>
<handler>on_object_toggled</handler> <handler>on_object_toggled</handler>
<object>propertybox</object> <object>propertybox</object>
<last_modification_time>Wed, 30 May 2001 02:18:16 GMT</last_modification_time> <last_modification_time>Sat, 09 Jun 2001 14:12:06 GMT</last_modification_time>
</signal> </signal>
<label>Active person's name and gramps ID</label> <label>Show coded detail indicators on lists</label>
<active>False</active> <active>False</active>
<draw_indicator>True</draw_indicator> <draw_indicator>True</draw_indicator>
<group>status</group>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
<widget>
<class>GtkRadioButton</class>
<name>stat3</name>
<can_focus>True</can_focus>
<signal>
<name>toggled</name>
<handler>on_object_toggled</handler>
<object>propertybox</object>
<last_modification_time>Wed, 30 May 2001 02:18:29 GMT</last_modification_time>
</signal>
<label>Active person's name and attribute</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
<group>status</group>
<child> <child>
<padding>0</padding> <padding>0</padding>
<expand>False</expand> <expand>False</expand>

19
src/gramps.glade
View File

@ -1585,8 +1585,8 @@
<handler>on_child_list_button_press_event</handler> <handler>on_child_list_button_press_event</handler>
<last_modification_time>Thu, 21 Dec 2000 20:47:47 GMT</last_modification_time> <last_modification_time>Thu, 21 Dec 2000 20:47:47 GMT</last_modification_time>
</signal> </signal>
<columns>4</columns> <columns>5</columns>
<column_widths>251,80,149,100</column_widths> <column_widths>210,50,200,75,50</column_widths>
<selection_mode>GTK_SELECTION_SINGLE</selection_mode> <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
<show_titles>True</show_titles> <show_titles>True</show_titles>
<shadow_type>GTK_SHADOW_IN</shadow_type> <shadow_type>GTK_SHADOW_IN</shadow_type>
@ -1621,7 +1621,7 @@
<class>GtkLabel</class> <class>GtkLabel</class>
<child_name>CList:title</child_name> <child_name>CList:title</child_name>
<name>label15</name> <name>label15</name>
<label>Birthdate</label> <label>Birth Date</label>
<justify>GTK_JUSTIFY_CENTER</justify> <justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap> <wrap>False</wrap>
<xalign>0.5</xalign> <xalign>0.5</xalign>
@ -1642,6 +1642,19 @@
<xpad>0</xpad> <xpad>0</xpad>
<ypad>0</ypad> <ypad>0</ypad>
</widget> </widget>
<widget>
<class>GtkLabel</class>
<child_name>CList:title</child_name>
<name>noteinfo</name>
<label>Details</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> </widget>
</widget> </widget>
</widget> </widget>

28
src/gramps_main.py
View File

@ -593,7 +593,11 @@ def marriage_edit(family):
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
def full_update(): def full_update():
Main.get_widget(NOTEBOOK).set_show_tabs(Config.usetabs) Main.get_widget(NOTEBOOK).set_show_tabs(Config.usetabs)
update_display(1) Main.get_widget("child_list").set_column_visibility(4,Config.show_detail)
apply_filter()
load_family()
load_sources()
load_tree()
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -764,6 +768,7 @@ def read_file(filename):
statusbar.set_status("") statusbar.set_status("")
Config.save_last_file("") Config.save_last_file("")
full_update()
statusbar.set_progress(0.0) statusbar.set_progress(0.0)
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -1843,6 +1848,7 @@ def display_marriage(family):
child_list = family.getChildList() child_list = family.getChildList()
child_list.sort(sort.by_birthdate) child_list.sort(sort.by_birthdate)
attr = ""
for child in child_list: for child in child_list:
status = "unknown" status = "unknown"
if child.getGender(): if child.getGender():
@ -1855,7 +1861,24 @@ def display_marriage(family):
for fam in child.getAltFamilyList(): for fam in child.getAltFamilyList():
if fam[0] == family: if fam[0] == family:
status = fam[1] status = fam[1]
clist.append([Config.nameof(child),gender,birthday(child),status])
if Config.show_detail:
attr = ""
if child.getNote() != "":
attr = attr + "N"
if len(child.getEventList())>0:
attr = attr + "E"
if len(child.getAttributeList())>0:
attr = attr + "A"
if len(child.getFamilyList()) > 0:
for f in child.getFamilyList():
if f.getFather() and f.getMother():
attr = attr + "M"
break
if len(child.getPhotoList()) > 0:
attr = attr + "P"
clist.append([Config.nameof(child),gender,birthday(child),status,attr])
clist.set_row_data(i,child) clist.set_row_data(i,child)
i=i+1 i=i+1
if i != 0: if i != 0:
@ -2231,6 +2254,7 @@ def main(arg):
database = RelDataBase() database = RelDataBase()
Config.loadConfig(full_update) Config.loadConfig(full_update)
Main.get_widget(NOTEBOOK).set_show_tabs(Config.usetabs) Main.get_widget(NOTEBOOK).set_show_tabs(Config.usetabs)
Main.get_widget("child_list").set_column_visibility(4,Config.show_detail)
if arg != None: if arg != None:
read_file(arg) read_file(arg)

34
src/marriage.glade
View File

@ -493,8 +493,8 @@
<handler>on_marriageEventList_select_row</handler> <handler>on_marriageEventList_select_row</handler>
<last_modification_time>Sat, 25 Nov 2000 16:53:14 GMT</last_modification_time> <last_modification_time>Sat, 25 Nov 2000 16:53:14 GMT</last_modification_time>
</signal> </signal>
<columns>3</columns> <columns>4</columns>
<column_widths>128,124,80</column_widths> <column_widths>100,150,175,50</column_widths>
<selection_mode>GTK_SELECTION_SINGLE</selection_mode> <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
<show_titles>True</show_titles> <show_titles>True</show_titles>
<shadow_type>GTK_SHADOW_IN</shadow_type> <shadow_type>GTK_SHADOW_IN</shadow_type>
@ -542,6 +542,19 @@
<xpad>0</xpad> <xpad>0</xpad>
<ypad>0</ypad> <ypad>0</ypad>
</widget> </widget>
<widget>
<class>GtkLabel</class>
<child_name>CList:title</child_name>
<name>event_details</name>
<label>Details</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> </widget>
<widget> <widget>
@ -831,8 +844,8 @@
<handler>on_attr_list_select_row</handler> <handler>on_attr_list_select_row</handler>
<last_modification_time>Sat, 02 Jun 2001 18:58:35 GMT</last_modification_time> <last_modification_time>Sat, 02 Jun 2001 18:58:35 GMT</last_modification_time>
</signal> </signal>
<columns>2</columns> <columns>3</columns>
<column_widths>189,80</column_widths> <column_widths>200,250,50</column_widths>
<selection_mode>GTK_SELECTION_SINGLE</selection_mode> <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
<show_titles>True</show_titles> <show_titles>True</show_titles>
<shadow_type>GTK_SHADOW_IN</shadow_type> <shadow_type>GTK_SHADOW_IN</shadow_type>
@ -862,6 +875,19 @@
<xpad>0</xpad> <xpad>0</xpad>
<ypad>0</ypad> <ypad>0</ypad>
</widget> </widget>
<widget>
<class>GtkLabel</class>
<child_name>CList:title</child_name>
<name>attr_details</name>
<label>Details</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> </widget>
</widget> </widget>

15
src/plugins/ReadGedcom.py
View File

@ -545,8 +545,9 @@ class GedcomParser:
else: else:
self.parse_person_object(2) self.parse_person_object(2)
elif matches[1] == "NOTE": elif matches[1] == "NOTE":
if matches[2] and matches[2][0] != "@": print matches[2]
note = matches[1] + self.parse_continue_data(1) if not string.strip(matches[2]) or matches[2] and matches[2][0] != "@":
note = matches[2] + self.parse_continue_data(1)
self.person.setNote(note) self.person.setNote(note)
self.ignore_sub_junk(2) self.ignore_sub_junk(2)
else: else:
@ -633,7 +634,7 @@ class GedcomParser:
self.backup() self.backup()
return note return note
elif matches[1] == "NOTE": elif matches[1] == "NOTE":
if matches[2] and matches[2][0] != "@": if not string.strip(matches[2]) or matches[2] and matches[2][0] != "@":
note = matches[2] + self.parse_continue_data(level+1) note = matches[2] + self.parse_continue_data(level+1)
self.parse_note_data(level+1) self.parse_note_data(level+1)
else: else:
@ -660,7 +661,7 @@ class GedcomParser:
elif matches[1] == "_PRIMARY": elif matches[1] == "_PRIMARY":
type = matches[1] type = matches[1]
elif matches[1] == "NOTE": elif matches[1] == "NOTE":
if matches[2] and matches[2][0] != "@": if not string.strip(matches[2]) or matches[2] and matches[2][0] != "@":
note = matches[2] + self.parse_continue_data(level+1) note = matches[2] + self.parse_continue_data(level+1)
self.parse_note_data(level+1) self.parse_note_data(level+1)
else: else:
@ -786,7 +787,7 @@ class GedcomParser:
elif matches[1] == "PHON": elif matches[1] == "PHON":
pass pass
elif matches[1] == "NOTE": elif matches[1] == "NOTE":
if matches[2] and matches[2][0] != "@": if not string.strip(matches[2]) or matches[2] and matches[2][0] != "@":
note = matches[1] + self.parse_continue_data(1) note = matches[1] + self.parse_continue_data(1)
self.address.setNote(note) self.address.setNote(note)
self.ignore_sub_junk(2) self.ignore_sub_junk(2)
@ -920,7 +921,7 @@ class GedcomParser:
event.setPlace(matches[2]) event.setPlace(matches[2])
self.ignore_sub_junk(level+1) self.ignore_sub_junk(level+1)
elif matches[1] == "NOTE": elif matches[1] == "NOTE":
if matches[2] and matches[2][0] != "@": if not string.strip(matches[2]) or matches[2] and matches[2][0] != "@":
note = matches[1] + self.parse_continue_data(1) note = matches[1] + self.parse_continue_data(1)
event.setNote(note) event.setNote(note)
self.ignore_sub_junk(2) self.ignore_sub_junk(2)
@ -957,7 +958,7 @@ class GedcomParser:
elif matches[1] == "QUAY": elif matches[1] == "QUAY":
pass pass
elif matches[1] == "NOTE": elif matches[1] == "NOTE":
if matches[2] and matches[2][0] != "@": if not string.strip(matches[2]) or matches[2] and matches[2][0] != "@":
note = matches[1] + self.parse_continue_data(1) note = matches[1] + self.parse_continue_data(1)
source.setComments(note) source.setComments(note)
self.ignore_sub_junk(2) self.ignore_sub_junk(2)