Fixed HTML options

svn: r1383
This commit is contained in:
Don Allingham 2003-03-23 03:26:55 +00:00
parent 5dbb17478f
commit 5a38afb512
7 changed files with 184 additions and 43 deletions

2
configure vendored
View File

@ -1621,7 +1621,7 @@ fi
LANGUAGES="sv pl de fr es it pt_BR ru da_DK cs ro nl" LANGUAGES="cs da_DK de es fr it nl pl pt_BR ro ru sv"
DISTLANGS= DISTLANGS=

View File

@ -36,15 +36,17 @@ import string
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import gtk import gtk
from gnome.ui import * import gtk.glade
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# gramps modules # gramps modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import const
import GrampsCfg import GrampsCfg
import AutoComp import AutoComp
import Utils
from intl import gettext as _ from intl import gettext as _
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -66,23 +68,15 @@ class FindBase:
self.clist = clist self.clist = clist
self.nlist = [] self.nlist = []
self.task = task self.task = task
title = "%s - GRAMPS" % name self.glade = gtk.glade.XML(const.gladeFile,"find")
self.top = GnomeDialog(title,STOCK_BUTTON_PREV, self.glade.signal_autoconnect({
STOCK_BUTTON_NEXT,STOCK_BUTTON_CLOSE) 'on_next_clicked' : self.on_next_clicked,
self.top.set_policy(0,1,0) 'on_back_clicked' : self.on_prev_clicked,
self.top.vbox.set_spacing(5) 'on_close_clicked' : self.on_close_clicked,
self.top.vbox.pack_start(gtk.GtkLabel(name),0,0,5) })
self.top.vbox.pack_start(gtk.GtkHSeparator(),0,0,0) self.top = self.glade.get_widget('find')
self.entry = gtk.GtkEntry() self.entry = self.glade.get_widget('entry')
self.top.vbox.pack_start(self.entry,0,0,25) Utils.set_titles(self.top, self.glade.get_widget('title'), name)
self.top.button_connect(0,self.on_prev_clicked)
self.top.button_connect(1,self.on_next_clicked)
self.top.button_connect(2,self.on_close_clicked)
self.top.set_usize(350,175)
self.top.set_default(1)
self.top.show_all()
self.top.editable_enters(self.entry)
self.entry.grab_focus()
def get_value(self,id): def get_value(self,id):
return None return None
@ -92,17 +86,7 @@ class FindBase:
self.comp = AutoComp.AutoEntry(self.entry,self.nlist) self.comp = AutoComp.AutoEntry(self.entry,self.nlist)
def advance(self,func): def advance(self,func):
try:
self.row = self.clist.selection[0]
except IndexError:
gtk.gdk_beep()
return
text = self.entry.get_text() text = self.entry.get_text()
if self.row == None or text == "":
gtk.gdk_beep()
return
orow = self.row
func() func()
while self.row != orow: while self.row != orow:
id = self.clist.get_row_data(self.row) id = self.clist.get_row_data(self.row)
@ -145,14 +129,14 @@ class FindBase:
class FindPerson(FindBase): class FindPerson(FindBase):
"""Opens a Find Person dialog for GRAMPS""" """Opens a Find Person dialog for GRAMPS"""
def __init__(self,clist,task,db): def __init__(self,id,task,db):
"""Opens a dialog box instance that allows users to """Opens a dialog box instance that allows users to
search for a person. search for a person.
clist - GtkCList containing the people information clist - GtkCList containing the people information
task - function to call to change the active person""" task - function to call to change the active person"""
FindBase.__init__(self,clist,task,_("Find Person"),db) FindBase.__init__(self,id,task,_("Find Person"),db)
for n in self.db.getPersonKeys(): for n in self.db.getPersonKeys():
val = self.db.getPersonDisplay(n) val = self.db.getPersonDisplay(n)
self.nlist.append(val[0]) self.nlist.append(val[0])

View File

@ -182,6 +182,7 @@ pkgpython_PYTHON = \
QuestionDialog.py\ QuestionDialog.py\
QuickAdd.py\ QuickAdd.py\
ReadXML.py\ ReadXML.py\
Relationship.py\
RelImage.py\ RelImage.py\
RelLib.py\ RelLib.py\
Report.py\ Report.py\

View File

@ -225,6 +225,9 @@ class ReportDialog:
# Allow for post processing of the format frame, since the # Allow for post processing of the format frame, since the
# show_all task calls events that may reset values # show_all task calls events that may reset values
menu = self.format_menu.get_menu()
self.doc_type_changed(menu.get_active())
self.setup_post_process() self.setup_post_process()

View File

@ -6161,7 +6161,7 @@
</child> </child>
</widget> </widget>
<widget class="GtkWindow" id="splash"> <widget class="GtkDialog" id="find">
<property name="visible">True</property> <property name="visible">True</property>
<property name="title" translatable="yes"></property> <property name="title" translatable="yes"></property>
<property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="type">GTK_WINDOW_TOPLEVEL</property>
@ -6169,15 +6169,169 @@
<property name="modal">False</property> <property name="modal">False</property>
<property name="resizable">True</property> <property name="resizable">True</property>
<property name="destroy_with_parent">False</property> <property name="destroy_with_parent">False</property>
<property name="icon">gramps.png</property>
<property name="has_separator">False</property>
<child> <child internal-child="vbox">
<widget class="GtkImage" id="image130"> <widget class="GtkVBox" id="dialog-vbox14">
<property name="visible">True</property> <property name="visible">True</property>
<property name="pixbuf">splash.jpg</property> <property name="homogeneous">False</property>
<property name="xalign">0.5</property> <property name="spacing">12</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property> <child internal-child="action_area">
<property name="ypad">0</property> <widget class="GtkHButtonBox" id="dialog-action_area14">
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
<widget class="GtkButton" id="button157">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-go-back</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="response_id">0</property>
<signal name="clicked" handler="on_back_clicked" last_modification_time="Sat, 22 Mar 2003 23:19:12 GMT"/>
</widget>
</child>
<child>
<widget class="GtkButton" id="button158">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-go-forward</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="response_id">0</property>
<signal name="clicked" handler="on_next_clicked" last_modification_time="Sat, 22 Mar 2003 23:18:59 GMT"/>
</widget>
</child>
<child>
<widget class="GtkButton" id="button159">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-close</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="response_id">-7</property>
<signal name="clicked" handler="on_close_clicked" last_modification_time="Sat, 22 Mar 2003 23:25:47 GMT"/>
</widget>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">GTK_PACK_END</property>
</packing>
</child>
<child>
<widget class="GtkVBox" id="vbox71">
<property name="border_width">12</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<widget class="GtkHBox" id="hbox89">
<property name="visible">True</property>
<property name="homogeneous">True</property>
<property name="spacing">0</property>
<child>
<widget class="GtkLabel" id="title">
<property name="visible">True</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="hbox88">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<widget class="GtkLabel" id="label370">
<property name="visible">True</property>
<property name="label" translatable="yes">_Text:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">entry</property>
</widget>
<packing>
<property name="padding">6</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkEntry" id="entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
<property name="invisible_char" translatable="yes">*</property>
<property name="activates_default">True</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">12</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child>
</widget> </widget>
</child> </child>
</widget> </widget>

View File

@ -431,7 +431,7 @@ class Gramps:
def on_find_activate(self,obj): def on_find_activate(self,obj):
"""Display the find box""" """Display the find box"""
if self.notebook.get_current_page() == 4: if self.notebook.get_current_page() == 4:
Find.FindPlace(self.place_view.place_list,self.find_goto_place,self.db) Find.FindPlace(self.active_person.getId(),self.find_goto_place,self.db)
elif self.notebook.get_current_page() == 3: elif self.notebook.get_current_page() == 3:
Find.FindSource(self.source_view.source_list,self.find_goto_source,self.db) Find.FindSource(self.source_view.source_list,self.find_goto_source,self.db)
elif self.notebook.get_current_page() == 5: elif self.notebook.get_current_page() == 5:
@ -443,10 +443,9 @@ class Gramps:
"""Display the find box""" """Display the find box"""
pass pass
def find_goto_to(self,row): def find_goto_to(self,id):
"""Find callback to jump to the selected person""" """Find callback to jump to the selected person"""
id = self.person_list.get_row_data(row) self.change_active_person(id)
self.change_active_person(self.db.getPerson(id))
self.goto_active_person() self.goto_active_person()
self.update_display(0) self.update_display(0)

Binary file not shown.