Documentation updates

svn: r389
This commit is contained in:
Don Allingham 2001-09-07 02:39:30 +00:00
parent 2c3673b546
commit 8161df0024
7 changed files with 763 additions and 594 deletions

View File

@ -297,7 +297,6 @@ def on_photo_select_icon(obj,iconNumber,event):
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
def on_delete_photo_clicked(obj): def on_delete_photo_clicked(obj):
epo = obj.get_data(_PLACE) epo = obj.get_data(_PLACE)
print epo
icon = epo.selectedIcon icon = epo.selectedIcon
if icon != -1: if icon != -1:

View File

@ -27,6 +27,7 @@ import libglade
import const import const
import utils import utils
import string import string
import gtk
_OBJECT = "o" _OBJECT = "o"
@ -69,6 +70,7 @@ class Find:
self.task(person) self.task(person)
return return
row = row + 1 row = row + 1
gtk.gdk_beep()
def find_prev(self): def find_prev(self):
"""Advances to the previous person that matches the dialog text""" """Advances to the previous person that matches the dialog text"""
@ -86,6 +88,7 @@ class Find:
self.task(person) self.task(person)
return return
row = row - 1 row = row - 1
gtk.gdk_beep()

File diff suppressed because it is too large Load Diff

View File

@ -703,6 +703,11 @@
<class>GtkEntry</class> <class>GtkEntry</class>
<name>filter</name> <name>filter</name>
<can_focus>True</can_focus> <can_focus>True</can_focus>
<signal>
<name>activate</name>
<handler>on_apply_filter_clicked</handler>
<last_modification_time>Thu, 06 Sep 2001 23:02:43 GMT</last_modification_time>
</signal>
<editable>True</editable> <editable>True</editable>
<text_visible>True</text_visible> <text_visible>True</text_visible>
<text_max_length>0</text_max_length> <text_max_length>0</text_max_length>

View File

@ -170,6 +170,7 @@ def deathday(person):
def find_goto_to(person): def find_goto_to(person):
change_active_person(person) change_active_person(person)
goto_active_person() goto_active_person()
update_display(0)
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -344,7 +345,7 @@ def on_delete_sp_clicked(obj):
active_person.removeFamily(active_family) active_person.removeFamily(active_family)
database.deleteFamily(active_family) database.deleteFamily(active_family)
if len(active_person.getFamilyList()) > 0: if len(active_person.getFamilyList()) > 0:
active_family = active_person.getFamilyIndex(0) active_family = active_person.getFamilyList()[0]
else: else:
active_family = None active_family = None
@ -877,7 +878,7 @@ def on_src_list_button_press_event(obj,event):
index = obj.get_data(INDEX) index = obj.get_data(INDEX)
if index >= 0: if index >= 0:
source = obj.get_row_data(index) source = obj.get_row_data(index)
EditSource.EditSource(source,database,update_after_edit) EditSource.EditSource(source,database,update_display_after_edit)
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -889,7 +890,7 @@ def on_place_list_button_press_event(obj,event):
index = obj.get_data(INDEX) index = obj.get_data(INDEX)
if index >= 0: if index >= 0:
place = obj.get_row_data(index) place = obj.get_row_data(index)
EditPlace.EditPlace(place,database,update_after_edit) EditPlace.EditPlace(place,database,update_display_after_edit)
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -1018,7 +1019,7 @@ def on_edit_source_clicked(obj):
index = obj.get_data(INDEX) index = obj.get_data(INDEX)
if index != -1: if index != -1:
source = obj.get_row_data(index) source = obj.get_row_data(index)
EditSource.EditSource(source,database,update_after_edit) EditSource.EditSource(source,database,update_display_after_edit)
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -1029,7 +1030,7 @@ def on_edit_place_clicked(obj):
index = obj.get_data(INDEX) index = obj.get_data(INDEX)
if index != -1: if index != -1:
place = obj.get_row_data(index) place = obj.get_row_data(index)
EditPlace.EditPlace(place,database,update_after_edit) EditPlace.EditPlace(place,database,update_display_after_edit)
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -1049,6 +1050,14 @@ def new_place_after_edit(place):
database.addPlace(place) database.addPlace(place)
update_display(0) update_display(0)
#-------------------------------------------------------------------------
#
#
#
#-------------------------------------------------------------------------
def update_display_after_edit(place):
update_display(0)
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# #

View File

@ -91,13 +91,14 @@ class IndividualPage:
# #
# #
#-------------------------------------------------------------------- #--------------------------------------------------------------------
def __init__(self,person,photos,restrict,private,link,list,dir_name,doc): def __init__(self,person,photos,restrict,private,uc,link,list,dir_name,doc):
self.person = person self.person = person
self.doc = doc self.doc = doc
self.list = list self.list = list
self.private = private self.private = private
self.alive = probably_alive(person) or restrict self.alive = probably_alive(person) or restrict
self.photos = (photos == 2) or (photos == 1 and not self.alive) self.photos = (photos == 2) or (photos == 1 and not self.alive)
self.usecomments = not uc
self.dir = dir_name self.dir = dir_name
self.link = link self.link = link
self.slist = [] self.slist = []
@ -198,19 +199,24 @@ class IndividualPage:
self.doc.start_paragraph("SourceParagraph") self.doc.start_paragraph("SourceParagraph")
self.doc.write_text('<A NAME="s%d">%d. ' % (index,index)) self.doc.write_text('<A NAME="s%d">%d. ' % (index,index))
index = index + 1 index = index + 1
self.doc.write_text("%s. " % sref.getBase().getTitle()) self.write_info(sref.getBase().getTitle())
author = sref.getBase().getAuthor() self.write_info(sref.getBase().getAuthor())
if author != "": self.write_info(sref.getBase().getPubInfo())
self.doc.write_text("%s. " % author) self.write_info(sref.getDate().getDate())
pubinfo = sref.getBase().getPubInfo() self.write_info(sref.getPage())
if pubinfo != "": if self.usecomments:
self.doc.write_text("%s. " % pubinfo) self.write_info(sref.getText())
if sref.getDate() != "": self.write_info(sref.getComments())
self.doc.write_text("%s. " % sref.getDate())
if sref.getPage() != "":
self.doc.write_text("%s. " % sref.getPage())
self.doc.end_paragraph() self.doc.end_paragraph()
def write_info(self,info):
info = string.strip(info)
if info != "":
if info[-1] == '.':
self.doc.write_text("%s " % info)
else:
self.doc.write_text("%s. " % info)
#-------------------------------------------------------------------- #--------------------------------------------------------------------
# #
# #
@ -702,7 +708,8 @@ def on_ok_clicked(obj):
templ_name = topDialog.get_widget("htmlTemplate").get_full_path(0) templ_name = topDialog.get_widget("htmlTemplate").get_full_path(0)
restrict = topDialog.get_widget("restrict").get_active() restrict = topDialog.get_widget("restrict").get_active()
privated = topDialog.get_widget("private").get_active() private = topDialog.get_widget("private").get_active()
srccomments = topDialog.get_widget("srccomments").get_active()
restrict_photos = topDialog.get_widget("restrict_photos").get_active() restrict_photos = topDialog.get_widget("restrict_photos").get_active()
no_photos = topDialog.get_widget("nophotos").get_active() no_photos = topDialog.get_widget("nophotos").get_active()
include_link = topDialog.get_widget("include_link").get_active() include_link = topDialog.get_widget("include_link").get_active()
@ -742,7 +749,7 @@ def on_ok_clicked(obj):
for person in ind_list: for person in ind_list:
doc = HtmlLinkDoc(styles,templ_name) doc = HtmlLinkDoc(styles,templ_name)
idoc = IndividualPage(person,photos,restrict,private,\ idoc = IndividualPage(person,photos,restrict,private,srccomments,\
include_link, ind_list,dir_name,doc) include_link, ind_list,dir_name,doc)
idoc.create_page() idoc.create_page()
idoc.close() idoc.close()

View File

@ -78,145 +78,6 @@
<row_spacing>0</row_spacing> <row_spacing>0</row_spacing>
<column_spacing>0</column_spacing> <column_spacing>0</column_spacing>
<widget>
<class>GnomeFileEntry</class>
<name>htmlTemplate</name>
<history_id>HtmlHistory</history_id>
<max_saved>10</max_saved>
<title>HTML Template</title>
<directory>False</directory>
<modal>False</modal>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>1</top_attach>
<bottom_attach>2</bottom_attach>
<xpad>10</xpad>
<ypad>10</ypad>
<xexpand>True</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
<widget>
<class>GtkEntry</class>
<child_name>GnomeEntry:entry</child_name>
<name>html_template</name>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
</widget>
</widget>
<widget>
<class>GnomeFileEntry</class>
<name>targetDirectory</name>
<width>400</width>
<history_id>htmldir</history_id>
<max_saved>10</max_saved>
<title>Target Directory</title>
<directory>True</directory>
<modal>False</modal>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>0</top_attach>
<bottom_attach>1</bottom_attach>
<xpad>10</xpad>
<ypad>10</ypad>
<xexpand>True</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
<widget>
<class>GtkEntry</class>
<child_name>GnomeEntry:entry</child_name>
<name>tgtdir</name>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
</widget>
</widget>
<widget>
<class>GtkSpinButton</class>
<name>spinbutton1</name>
<can_focus>True</can_focus>
<climb_rate>1</climb_rate>
<digits>0</digits>
<numeric>True</numeric>
<update_policy>GTK_UPDATE_ALWAYS</update_policy>
<snap>False</snap>
<wrap>False</wrap>
<value>4</value>
<lower>0</lower>
<upper>100</upper>
<step>1</step>
<page>10</page>
<page_size>10</page_size>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>3</top_attach>
<bottom_attach>4</bottom_attach>
<xpad>10</xpad>
<ypad>10</ypad>
<xexpand>True</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkCombo</class>
<name>filterName</name>
<value_in_list>False</value_in_list>
<ok_if_empty>True</ok_if_empty>
<case_sensitive>False</case_sensitive>
<use_arrows>True</use_arrows>
<use_arrows_always>False</use_arrows_always>
<items></items>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>10</xpad>
<ypad>10</ypad>
<xexpand>True</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
<widget>
<class>GtkEntry</class>
<child_name>GtkCombo:entry</child_name>
<name>filter</name>
<can_focus>True</can_focus>
<editable>False</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
</widget>
</widget>
<widget> <widget>
<class>GtkLabel</class> <class>GtkLabel</class>
<name>label3</name> <name>label3</name>
@ -320,6 +181,145 @@
<yfill>False</yfill> <yfill>False</yfill>
</child> </child>
</widget> </widget>
<widget>
<class>GnomeFileEntry</class>
<name>targetDirectory</name>
<width>400</width>
<history_id>htmldir</history_id>
<max_saved>10</max_saved>
<title>Target Directory</title>
<directory>True</directory>
<modal>False</modal>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>0</top_attach>
<bottom_attach>1</bottom_attach>
<xpad>10</xpad>
<ypad>5</ypad>
<xexpand>True</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
<widget>
<class>GtkEntry</class>
<child_name>GnomeEntry:entry</child_name>
<name>tgtdir</name>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
</widget>
</widget>
<widget>
<class>GnomeFileEntry</class>
<name>htmlTemplate</name>
<history_id>HtmlHistory</history_id>
<max_saved>10</max_saved>
<title>HTML Template</title>
<directory>False</directory>
<modal>False</modal>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>1</top_attach>
<bottom_attach>2</bottom_attach>
<xpad>10</xpad>
<ypad>5</ypad>
<xexpand>True</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
<widget>
<class>GtkEntry</class>
<child_name>GnomeEntry:entry</child_name>
<name>html_template</name>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
</widget>
</widget>
<widget>
<class>GtkCombo</class>
<name>filterName</name>
<value_in_list>False</value_in_list>
<ok_if_empty>True</ok_if_empty>
<case_sensitive>False</case_sensitive>
<use_arrows>True</use_arrows>
<use_arrows_always>False</use_arrows_always>
<items></items>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>10</xpad>
<ypad>5</ypad>
<xexpand>True</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
<widget>
<class>GtkEntry</class>
<child_name>GtkCombo:entry</child_name>
<name>filter</name>
<can_focus>True</can_focus>
<editable>False</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
</widget>
</widget>
<widget>
<class>GtkSpinButton</class>
<name>spinbutton1</name>
<can_focus>True</can_focus>
<climb_rate>1</climb_rate>
<digits>0</digits>
<numeric>True</numeric>
<update_policy>GTK_UPDATE_ALWAYS</update_policy>
<snap>False</snap>
<wrap>False</wrap>
<value>4</value>
<lower>0</lower>
<upper>100</upper>
<step>1</step>
<page>10</page>
<page_size>10</page_size>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>3</top_attach>
<bottom_attach>4</bottom_attach>
<xpad>10</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>
</widget> </widget>
@ -486,6 +486,21 @@
<fill>False</fill> <fill>False</fill>
</child> </child>
</widget> </widget>
<widget>
<class>GtkCheckButton</class>
<name>srccomments</name>
<border_width>3</border_width>
<can_focus>True</can_focus>
<label>Do not include comments and text in source information</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
</widget> </widget>
</widget> </widget>