Patch names improvements

svn: r1345
This commit is contained in:
Don Allingham 2003-03-12 23:17:54 +00:00
parent 4a23759811
commit 56a12cac3f
4 changed files with 158 additions and 145 deletions

View File

@ -952,7 +952,7 @@ class Gramps:
if self.id2col.has_key(id): if self.id2col.has_key(id):
(model,iter) = self.id2col[id] (model,iter) = self.id2col[id]
self.ptabs.set_current_page(self.model2page[model]) self.ptabs.set_current_page(self.model2page[model])
if self.model_used[model] == 0: if not self.model_used.has_key(model) or self.model_used[model] == 0:
self.model_used[model] = 1 self.model_used[model] = 1
self.apply_filter(model) self.apply_filter(model)
@ -1357,7 +1357,7 @@ class Gramps:
else: else:
model = self.default_list model = self.default_list
# self.apply_filter() self.apply_filter()
for key in keys: for key in keys:
self.alpha_page[key].connect_model() self.alpha_page[key].connect_model()

View File

@ -114,7 +114,12 @@ class PatchNames:
"destroy_passed_object" : Utils.destroy_passed_object, "destroy_passed_object" : Utils.destroy_passed_object,
"on_ok_clicked" : self.on_ok_clicked "on_ok_clicked" : self.on_ok_clicked
}) })
self.top.get_widget("textwindow").show_string(msg)
Utils.set_titles(self.top.get_widget('summary'),
self.top.get_widget('title'),
_('Name and title extraction tool'))
self.top.get_widget("textwindow").get_buffer().set_text(msg)
else: else:
OkDialog(_("No titles or nicknames were found")) OkDialog(_("No titles or nicknames were found"))
self.cb(0) self.cb(0)

View File

@ -2,147 +2,165 @@
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
<glade-interface> <glade-interface>
<requires lib="gnome" />
<widget class="GtkDialog" id="summary"> <widget class="GtkDialog" id="summary">
<property name="title" translatable="yes">Name and Title Extraction Tool - GRAMPS</property> <property name="visible">True</property>
<property name="title" translatable="yes"></property>
<property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="modal">no</property> <property name="window_position">GTK_WIN_POS_NONE</property>
<property name="allow_shrink">yes</property> <property name="modal">False</property>
<property name="allow_grow">yes</property> <property name="default_width">450</property>
<property name="visible">yes</property> <property name="default_height">400</property>
<property name="window-position">GTK_WIN_POS_NONE</property> <property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
<property name="has_separator">False</property>
<child internal-child="vbox"> <child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox1"> <widget class="GtkVBox" id="dialog-vbox1">
<property name="homogeneous">no</property> <property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property> <property name="spacing">0</property>
<property name="visible">yes</property>
<child internal-child="action_area"> <child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area1"> <widget class="GtkHButtonBox" id="dialog-action_area1">
<property name="border_width">10</property> <property name="visible">True</property>
<property name="homogeneous">yes</property> <property name="layout_style">GTK_BUTTONBOX_END</property>
<property name="spacing">5</property>
<property name="visible">yes</property>
<child> <child>
<widget class="GtkHButtonBox" id="hbuttonbox1"> <widget class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property> <property name="layout_style">GTK_BUTTONBOX_END</property>
<property name="spacing">30</property> <property name="spacing">30</property>
<property name="visible">yes</property>
<child> <child>
<widget class="GtkButton" id="button3"> <widget class="GtkButton" id="button3">
<property name="can_default">yes</property> <property name="visible">True</property>
<property name="can_focus">yes</property> <property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">_Accept changes and close</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property> <property name="relief">GTK_RELIEF_NORMAL</property>
<property name="visible">yes</property>
<property name="label">gtk-yes</property>
<property name="use_stock">yes</property>
<property name="use_underline">yes</property>
<signal name="clicked" handler="on_ok_clicked" object="summary"/> <signal name="clicked" handler="on_ok_clicked" object="summary"/>
</widget> </widget>
</child> </child>
<child> <child>
<widget class="GtkButton" id="button4"> <widget class="GtkButton" id="button4">
<property name="can_default">yes</property> <property name="visible">True</property>
<property name="can_focus">yes</property> <property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property> <property name="relief">GTK_RELIEF_NORMAL</property>
<property name="visible">yes</property>
<property name="label">gtk-no</property>
<property name="use_stock">yes</property>
<property name="use_underline">yes</property>
<signal name="clicked" handler="destroy_passed_object" object="summary"/> <signal name="clicked" handler="destroy_passed_object" object="summary"/>
</widget> </widget>
</child> </child>
</widget> </widget>
<packing>
<property name="padding">0</property>
<property name="expand">yes</property>
<property name="fill">yes</property>
</packing>
</child> </child>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>
<property name="expand">no</property> <property name="expand">False</property>
<property name="fill">yes</property> <property name="fill">True</property>
<property name="pack_type">GTK_PACK_END</property> <property name="pack_type">GTK_PACK_END</property>
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkVBox" id="vbox1"> <widget class="GtkVBox" id="vbox1">
<property name="homogeneous">no</property> <property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property> <property name="spacing">0</property>
<property name="visible">yes</property>
<child> <child>
<widget class="GtkLabel" id="summaryTitle"> <widget class="GtkLabel" id="title">
<property name="label" translatable="yes">Name and Title Extraction Tool</property> <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_CENTER</property> <property name="justify">GTK_JUSTIFY_CENTER</property>
<property name="wrap">no</property> <property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
<property name="yalign">0.5</property> <property name="yalign">0.5</property>
<property name="xpad">0</property> <property name="xpad">0</property>
<property name="ypad">0</property> <property name="ypad">0</property>
<property name="width-request">500</property>
<property name="height-request">16</property>
<property name="visible">yes</property>
</widget> </widget>
<packing> <packing>
<property name="padding">8</property> <property name="padding">8</property>
<property name="expand">no</property> <property name="expand">False</property>
<property name="fill">no</property> <property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkHSeparator" id="hseparator1">
<property name="visible">yes</property>
</widget>
<packing>
<property name="padding">4</property>
<property name="expand">no</property>
<property name="fill">yes</property>
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkLabel" id="label1"> <widget class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="label" translatable="yes">Below is a list of the nicknames and titles that GRAMPS can extract from the <property name="label" translatable="yes">Below is a list of the nicknames and titles that GRAMPS can extract from the
current database. If you select 'Yes', GRAMPS will modify your database as current database. If you accept the changes, GRAMPS will modify your database as
specified below. If you do not approve of these changes, you should select specified below. If you do not approve of these changes, you should select
'No', and your database will not be altered. 'Cancel', and your database will not be altered.
Should the following changes be made?</property> Should the following changes be made?</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">no</property> <property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property> <property name="xalign">0.5</property>
<property name="yalign">0.5</property> <property name="yalign">0.5</property>
<property name="xpad">0</property> <property name="xpad">0</property>
<property name="ypad">10</property> <property name="ypad">10</property>
<property name="visible">yes</property>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>
<property name="expand">no</property> <property name="expand">False</property>
<property name="fill">no</property> <property name="fill">False</property>
</packing> </packing>
</child> </child>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_IN</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
<widget class="GtkTextView" id="textwindow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">True</property>
<property name="justification">GTK_JUSTIFY_LEFT</property>
<property name="wrap_mode">GTK_WRAP_NONE</property>
<property name="cursor_visible">True</property>
<property name="pixels_above_lines">0</property>
<property name="pixels_below_lines">0</property>
<property name="pixels_inside_wrap">0</property>
<property name="left_margin">0</property>
<property name="right_margin">0</property>
<property name="indent">0</property>
<property name="text" translatable="yes"></property>
</widget>
</child>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="padding">0</property>
<property name="expand">yes</property> <property name="expand">True</property>
<property name="fill">yes</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> </packing>
</child> </child>
</widget> </widget>
</child> </child>
</widget> </widget>
</glade-interface> </glade-interface>

View File

@ -1,13 +1,3 @@
<?xml version="1.0" encoding="iso-8859-1"?> <?xml version="1.0" encoding="utf-8"?>
<filters> <filters>
<filter name="Allingham Men" function="and">
<rule class="Is a male">
</rule>
<rule class="Has a name">
<arg value=""/>
<arg value="Allingham"/>
<arg value=""/>
<arg value=""/>
</rule>
</filter>
</filters> </filters>