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

NotRelated.py: convert to use gtkbuilder instead of libglade

Browse Source 
svn: r12438
This commit is contained in:
Gerald Britton 2009-04-13 18:56:50 +00:00
parent 180c02bbce
commit a1e9323d3b
2 changed files with 276 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

481
src/plugins/tool/NotRelated.glade
View File

@ -1,240 +1,241 @@
<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> <?xml version="1.0"?>
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> <!--*- mode: xml -*-->
<interface>
<glade-interface> <object class="GtkListStore" id="model1">
<columns>
<widget class="GtkDialog" id="top"> <column type="gchararray"/>
<property name="title" translatable="yes"></property> </columns>
<property name="type">GTK_WINDOW_TOPLEVEL</property> <data>
<property name="window_position">GTK_WIN_POS_NONE</property> <row>
<property name="modal">False</property> <col id="0" translatable="yes"/>
<property name="default_width">450</property> </row>
<property name="default_height">400</property> <row>
<property name="resizable">True</property> <col id="0" translatable="yes">ToDo</col>
<property name="destroy_with_parent">False</property> </row>
<property name="decorated">True</property> <row>
<property name="skip_taskbar_hint">False</property> <col id="0" translatable="yes">NotRelated</col>
<property name="skip_pager_hint">False</property> </row>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> </data>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property> </object>
<property name="focus_on_map">True</property> <object class="GtkDialog" id="top">
<property name="urgency_hint">False</property> <property name="title" translatable="yes"/>
<property name="has_separator">False</property> <property name="type">GTK_WINDOW_TOPLEVEL</property>
<signal name="delete_event" handler="on_delete_event" last_modification_time="Thu, 24 Mar 2005 18:53:09 GMT"/> <property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
<child internal-child="vbox"> <property name="default_width">450</property>
<widget class="GtkVBox" id="dialog-vbox1"> <property name="default_height">400</property>
<property name="visible">True</property> <property name="resizable">True</property>
<property name="homogeneous">False</property> <property name="destroy_with_parent">False</property>
<property name="spacing">0</property> <property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
<child internal-child="action_area"> <property name="skip_pager_hint">False</property>
<widget class="GtkHButtonBox" id="dialog-action_area1"> <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="visible">True</property> <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="layout_style">GTK_BUTTONBOX_END</property> <property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
<child> <property name="has_separator">False</property>
<widget class="GtkButton" id="close"> <signal handler="on_delete_event" last_modification_time="Thu, 24 Mar 2005 18:53:09 GMT" name="delete_event"/>
<property name="visible">True</property> <child internal-child="vbox">
<property name="can_default">True</property> <object class="GtkVBox" id="dialog-vbox1">
<property name="can_focus">True</property> <property name="visible">True</property>
<property name="label">gtk-close</property> <property name="homogeneous">False</property>
<property name="use_stock">True</property> <property name="spacing">0</property>
<property name="relief">GTK_RELIEF_NORMAL</property> <child internal-child="action_area">
<property name="focus_on_click">True</property> <object class="GtkHButtonBox" id="dialog-action_area1">
<property name="response_id">0</property> <property name="visible">True</property>
<signal name="clicked" handler="destroy_passed_object" object="top"/> <property name="layout_style">GTK_BUTTONBOX_END</property>
</widget> <child>
</child> <object class="GtkButton" id="close">
<property name="visible">True</property>
<child> <property name="can_default">True</property>
<widget class="GtkButton" id="help"> <property name="can_focus">True</property>
<property name="visible">True</property> <property name="label">gtk-close</property>
<property name="can_default">True</property> <property name="use_stock">True</property>
<property name="can_focus">True</property> <property name="relief">GTK_RELIEF_NORMAL</property>
<property name="label">gtk-help</property> <property name="focus_on_click">True</property>
<property name="use_stock">True</property> <signal handler="destroy_passed_object" name="clicked" object="top"/>
<property name="relief">GTK_RELIEF_NORMAL</property> </object>
<property name="focus_on_click">True</property> </child>
<property name="response_id">-11</property> <child>
<signal name="clicked" handler="on_help_clicked" last_modification_time="Fri, 25 Mar 2005 02:17:46 GMT"/> <object class="GtkButton" id="help">
</widget> <property name="visible">True</property>
</child> <property name="can_default">True</property>
<property name="can_focus">True</property>
</widget> <property name="label">gtk-help</property>
<packing> <property name="use_stock">True</property>
<property name="padding">0</property> <property name="relief">GTK_RELIEF_NORMAL</property>
<property name="expand">False</property> <property name="focus_on_click">True</property>
<property name="fill">True</property> <signal handler="on_help_clicked" last_modification_time="Fri, 25 Mar 2005 02:17:46 GMT" name="clicked"/>
<property name="pack_type">GTK_PACK_END</property> </object>
</packing> </child>
</child> </object>
<packing>
<child> <property name="padding">0</property>
<widget class="GtkVBox" id="vbox1"> <property name="expand">False</property>
<property name="border_width">6</property> <property name="fill">True</property>
<property name="visible">True</property> <property name="pack_type">GTK_PACK_END</property>
<property name="homogeneous">False</property> </packing>
<property name="spacing">6</property> </child>
<child>
<child> <object class="GtkVBox" id="vbox1">
<widget class="GtkLabel" id="title"> <property name="border_width">6</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes"></property> <property name="homogeneous">False</property>
<property name="use_underline">False</property> <property name="spacing">6</property>
<property name="use_markup">False</property> <child>
<property name="justify">GTK_JUSTIFY_CENTER</property> <object class="GtkLabel" id="title">
<property name="wrap">False</property> <property name="visible">True</property>
<property name="selectable">False</property> <property name="label" translatable="yes"/>
<property name="xalign">0.5</property> <property name="use_underline">False</property>
<property name="yalign">0.5</property> <property name="use_markup">False</property>
<property name="xpad">0</property> <property name="justify">GTK_JUSTIFY_CENTER</property>
<property name="ypad">0</property> <property name="wrap">False</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> <property name="selectable">False</property>
<property name="width_chars">-1</property> <property name="xalign">0.5</property>
<property name="single_line_mode">False</property> <property name="yalign">0.5</property>
<property name="angle">0</property> <property name="xpad">0</property>
</widget> <property name="ypad">0</property>
<packing> <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="padding">8</property> <property name="width_chars">-1</property>
<property name="expand">False</property> <property name="single_line_mode">False</property>
<property name="fill">False</property> <property name="angle">0</property>
</packing> </object>
</child> <packing>
<property name="padding">8</property>
<child> <property name="expand">False</property>
<widget class="GtkScrolledWindow" id="scrolledwindow1"> <property name="fill">False</property>
<property name="visible">True</property> </packing>
<property name="can_focus">True</property> </child>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <child>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="shadow_type">GTK_SHADOW_OUT</property> <property name="visible">True</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property> <property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<child> <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<widget class="GtkTreeView" id="treeview"> <property name="shadow_type">GTK_SHADOW_OUT</property>
<property name="visible">True</property> <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<property name="can_focus">True</property> <child>
<property name="headers_visible">True</property> <object class="GtkTreeView" id="treeview">
<property name="rules_hint">False</property> <property name="visible">True</property>
<property name="reorderable">False</property> <property name="can_focus">True</property>
<property name="enable_search">True</property> <property name="headers_visible">True</property>
<property name="fixed_height_mode">False</property> <property name="rules_hint">False</property>
<property name="hover_selection">False</property> <property name="reorderable">False</property>
<property name="hover_expand">False</property> <property name="enable_search">True</property>
</widget> <property name="fixed_height_mode">False</property>
</child> <property name="hover_selection">False</property>
</widget> <property name="hover_expand">False</property>
<packing> </object>
<property name="padding">0</property> </child>
<property name="expand">True</property> </object>
<property name="fill">True</property> <packing>
</packing> <property name="padding">0</property>
</child> <property name="expand">True</property>
</widget> <property name="fill">True</property>
<packing> </packing>
<property name="padding">0</property> </child>
<property name="expand">True</property> </object>
<property name="fill">True</property> <packing>
</packing> <property name="padding">0</property>
</child> <property name="expand">True</property>
<property name="fill">True</property>
<child> </packing>
<widget class="GtkFrame" id="frame"> </child>
<property name="border_width">6</property> <child>
<property name="visible">True</property> <object class="GtkFrame" id="frame">
<property name="label_xalign">0</property> <property name="border_width">6</property>
<property name="label_yalign">0.5</property> <property name="visible">True</property>
<property name="shadow_type">GTK_SHADOW_IN</property> <property name="label_xalign">0</property>
<property name="label_yalign">0.5</property>
<child> <property name="shadow_type">GTK_SHADOW_IN</property>
<widget class="GtkAlignment" id="alignment"> <child>
<property name="border_width">6</property> <object class="GtkAlignment" id="alignment">
<property name="visible">True</property> <property name="border_width">6</property>
<property name="xalign">0.5</property> <property name="visible">True</property>
<property name="yalign">0.5</property> <property name="xalign">0.5</property>
<property name="xscale">1</property> <property name="yalign">0.5</property>
<property name="yscale">1</property> <property name="xscale">1</property>
<property name="top_padding">0</property> <property name="yscale">1</property>
<property name="bottom_padding">0</property> <property name="top_padding">0</property>
<property name="left_padding">12</property> <property name="bottom_padding">0</property>
<property name="right_padding">0</property> <property name="left_padding">12</property>
<property name="right_padding">0</property>
<child> <child>
<widget class="GtkHBox" id="hbox1"> <object class="GtkHBox" id="hbox1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="homogeneous">False</property> <property name="homogeneous">False</property>
<property name="spacing">3</property> <property name="spacing">3</property>
<child>
<child> <object class="GtkComboBoxEntry" id="markercombo">
<widget class="GtkComboBoxEntry" id="markercombo"> <property name="visible">True</property>
<property name="visible">True</property> <property name="add_tearoffs">False</property>
<property name="items" translatable="yes"> <property name="has_frame">True</property>
ToDo <property name="focus_on_click">True</property>
NotRelated</property> <accelerator key="M" modifiers="GDK_MOD1_MASK" signal="grab_focus"/>
<property name="add_tearoffs">False</property> <property name="model">model1</property>
<property name="has_frame">True</property> <child>
<property name="focus_on_click">True</property> <object class="GtkCellRendererText" id="renderer1"/>
<accelerator key="M" modifiers="GDK_MOD1_MASK" signal="grab_focus"/> <attributes>
</widget> <attribute name="text">0</attribute>
<packing> </attributes>
<property name="padding">0</property> </child>
<property name="expand">True</property> </object>
<property name="fill">True</property> <packing>
</packing> <property name="padding">0</property>
</child> <property name="expand">True</property>
<property name="fill">True</property>
<child> </packing>
<widget class="GtkButton" id="markerapply"> </child>
<property name="visible">True</property> <child>
<property name="can_focus">True</property> <object class="GtkButton" id="markerapply">
<property name="label">gtk-apply</property> <property name="visible">True</property>
<property name="use_stock">True</property> <property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property> <property name="label">gtk-apply</property>
<property name="focus_on_click">True</property> <property name="use_stock">True</property>
</widget> <property name="relief">GTK_RELIEF_NORMAL</property>
<packing> <property name="focus_on_click">True</property>
<property name="padding">0</property> </object>
<property name="expand">False</property> <packing>
<property name="fill">False</property> <property name="padding">0</property>
</packing> <property name="expand">False</property>
</child> <property name="fill">False</property>
</widget> </packing>
</child> </child>
</widget> </object>
</child> </child>
</object>
<child> </child>
<widget class="GtkLabel" id="marker"> <child type="label">
<property name="visible">True</property> <object class="GtkLabel" id="marker">
<property name="label" translatable="yes">_Marker</property> <property name="visible">True</property>
<property name="use_underline">True</property> <property name="label" translatable="yes">_Marker</property>
<property name="use_markup">True</property> <property name="use_underline">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="use_markup">True</property>
<property name="wrap">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="selectable">False</property> <property name="wrap">False</property>
<property name="xalign">0.5</property> <property name="selectable">False</property>
<property name="yalign">0.5</property> <property name="xalign">0.5</property>
<property name="xpad">0</property> <property name="yalign">0.5</property>
<property name="ypad">0</property> <property name="xpad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> <property name="ypad">0</property>
<property name="width_chars">-1</property> <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="single_line_mode">False</property> <property name="width_chars">-1</property>
<property name="angle">0</property> <property name="single_line_mode">False</property>
</widget> <property name="angle">0</property>
<packing> </object>
<property name="type">label_item</property> </child>
</packing> </object>
</child> <packing>
</widget> <property name="padding">0</property>
<packing> <property name="expand">False</property>
<property name="padding">0</property> <property name="fill">True</property>
<property name="expand">False</property> </packing>
<property name="fill">True</property> </child>
</packing> </object>
</child> </child>
</widget> <action-widgets>
</child> <action-widget response="0">close</action-widget>
</widget> <action-widget response="-11">help</action-widget>
</action-widgets>
</glade-interface> </object>
</interface>

61
src/plugins/tool/NotRelated.py
View File

@ -81,19 +81,23 @@ class NotRelated(Tool.ActivePersonTool, ManagedWindow.ManagedWindow) :
self.dbstate = dbstate self.dbstate = dbstate
self.uistate = uistate self.uistate = uistate
self.db = dbstate.db self.db = dbstate.db
glade_file = "%s/NotRelated.glade" % os.path.dirname(__file__)
topDialog = gtk.glade.XML(glade_file, "top", "gramps") base = os.path.dirname(__file__)
topDialog.signal_autoconnect({ glade_file = base + os.sep + "NotRelated.glade"
topDialog = gtk.Builder()
topDialog.add_from_file(glade_file)
topDialog.connect_signals({
"destroy_passed_object" : self.close, "destroy_passed_object" : self.close,
"on_help_clicked" : self.on_help_clicked, "on_help_clicked" : self.on_help_clicked,
}) })
window = topDialog.get_widget("top") window = topDialog.get_object("top")
title = topDialog.get_widget("title") title = topDialog.get_object("title")
self.set_window(window, title, self.title) self.set_window(window, title, self.title)
self.markercombo = topDialog.get_widget("markercombo") self.markercombo = topDialog.get_object("markercombo")
self.markerapply = topDialog.get_widget("markerapply") self.markerapply = topDialog.get_object("markerapply")
self.markercombo.set_sensitive(False) self.markercombo.set_sensitive(False)
self.markerapply.set_sensitive(False) self.markerapply.set_sensitive(False)
self.markerapply.connect('clicked', self.applyMarkerClicked) self.markerapply.connect('clicked', self.applyMarkerClicked)
@ -112,7 +116,7 @@ class NotRelated(Tool.ActivePersonTool, ManagedWindow.ManagedWindow) :
# note -- don't assign the model to the tree until it has been populated, # note -- don't assign the model to the tree until it has been populated,
# otherwise the screen updates are terribly slow while names are appended # otherwise the screen updates are terribly slow while names are appended
self.treeView = topDialog.get_widget("treeview") self.treeView = topDialog.get_object("treeview")
col1 = gtk.TreeViewColumn(_('Name'), gtk.CellRendererText(), text=0) col1 = gtk.TreeViewColumn(_('Name'), gtk.CellRendererText(), text=0)
col2 = gtk.TreeViewColumn(_('ID'), gtk.CellRendererText(), text=1) col2 = gtk.TreeViewColumn(_('ID'), gtk.CellRendererText(), text=1)
col3 = gtk.TreeViewColumn(_('Parents'), gtk.CellRendererText(), text=2) col3 = gtk.TreeViewColumn(_('Parents'), gtk.CellRendererText(), text=2)
@ -263,7 +267,8 @@ class NotRelated(Tool.ActivePersonTool, ManagedWindow.ManagedWindow) :
def findRelatedPeople(self) : def findRelatedPeople(self) :
self.progress.set_pass(_('Finding relationships between %d people') % self.numberOfPeopleInDatabase, self.numberOfPeopleInDatabase) self.progress.set_pass(_('Finding relationships between %d people') %
self.numberOfPeopleInDatabase, self.numberOfPeopleInDatabase)
# as long as we have people we haven't processed yet, keep looping # as long as we have people we haven't processed yet, keep looping
while len(self.handlesOfPeopleToBeProcessed) > 0: while len(self.handlesOfPeopleToBeProcessed) > 0:
@ -292,45 +297,48 @@ class NotRelated(Tool.ActivePersonTool, ManagedWindow.ManagedWindow) :
for familyHandle in person.get_family_handle_list(): for familyHandle in person.get_family_handle_list():
family = self.db.get_family_from_handle(familyHandle) family = self.db.get_family_from_handle(familyHandle)
spouseHandle = ReportUtils.find_spouse(person, family) spouseHandle = ReportUtils.find_spouse(person, family)
if spouseHandle: if spouseHandle and \
if spouseHandle not in self.handlesOfPeopleAlreadyProcessed or spouseHandle not in self.handlesOfPeopleToBeProcessed: spouseHandle not in self.handlesOfPeopleAlreadyProcessed:
self.handlesOfPeopleToBeProcessed.add(spouseHandle) self.handlesOfPeopleToBeProcessed.add(spouseHandle)
# step 2 -- parents # step 2 -- parents
for familyHandle in person.get_parent_family_handle_list(): for familyHandle in person.get_parent_family_handle_list():
family = self.db.get_family_from_handle(familyHandle) family = self.db.get_family_from_handle(familyHandle)
fatherHandle = family.get_father_handle() fatherHandle = family.get_father_handle()
motherHandle = family.get_mother_handle() motherHandle = family.get_mother_handle()
if fatherHandle: if fatherHandle and \
if fatherHandle not in self.handlesOfPeopleAlreadyProcessed or fatherHandle not in self.handlesOfPeopleToBeProcessed: fatherHandle not in self.handlesOfPeopleAlreadyProcessed:
self.handlesOfPeopleToBeProcessed.add(fatherHandle) self.handlesOfPeopleToBeProcessed.add(fatherHandle)
if motherHandle: if motherHandle and \
if motherHandle not in self.handlesOfPeopleAlreadyProcessed or motherHandle not in self.handlesOfPeopleToBeProcessed: motherHandle not in self.handlesOfPeopleAlreadyProcessed:
self.handlesOfPeopleToBeProcessed.add(motherHandle) self.handlesOfPeopleToBeProcessed.add(motherHandle)
# step 3 -- children # step 3 -- children
for familyHandle in person.get_family_handle_list(): for familyHandle in person.get_family_handle_list():
family = self.db.get_family_from_handle(familyHandle) family = self.db.get_family_from_handle(familyHandle)
for childRef in family.get_child_ref_list(): for childRef in family.get_child_ref_list():
childHandle = childRef.ref childHandle = childRef.ref
if childHandle: if childHandle and \
if childHandle not in self.handlesOfPeopleAlreadyProcessed or childHandle not in self.handlesOfPeopleToBeProcessed: childHandle not in self.handlesOfPeopleAlreadyProcessed:
self.handlesOfPeopleToBeProcessed.add(childHandle) self.handlesOfPeopleToBeProcessed.add(childHandle)
def findUnrelatedPeople(self) : def findUnrelatedPeople(self) :
# update our numbers # update our numbers
self.numberOfRelatedPeople = len(self.handlesOfPeopleAlreadyProcessed) self.numberOfRelatedPeople = len(self.handlesOfPeopleAlreadyProcessed)
self.numberOfUnrelatedPeople = self.numberOfPeopleInDatabase - self.numberOfRelatedPeople self.numberOfUnrelatedPeople = self.numberOfPeopleInDatabase - \
self.numberOfRelatedPeople
if self.numberOfUnrelatedPeople > 0: if self.numberOfUnrelatedPeople > 0:
# we have at least 1 "unrelated" person to find # we have at least 1 "unrelated" person to find
if self.numberOfUnrelatedPeople == 1: if self.numberOfUnrelatedPeople == 1:
self.progress.set_pass(_('Looking for 1 person'), self.numberOfPeopleInDatabase) self.progress.set_pass(_('Looking for 1 person'),
self.numberOfPeopleInDatabase)
else: else:
self.progress.set_pass(_('Looking for %d people') % self.numberOfUnrelatedPeople, self.numberOfPeopleInDatabase) self.progress.set_pass(_('Looking for %d people') %
self.numberOfUnrelatedPeople, self.numberOfPeopleInDatabase)
# loop through everyone in the database # loop through everyone in the database
for handle in self.db.get_person_handles(False): for handle in self.db.get_person_handles(False):
@ -355,7 +363,8 @@ class NotRelated(Tool.ActivePersonTool, ManagedWindow.ManagedWindow) :
if self.numberOfUnrelatedPeople == 1: if self.numberOfUnrelatedPeople == 1:
self.progress.set_pass(_('Looking up the name for 1 person'), 1) self.progress.set_pass(_('Looking up the name for 1 person'), 1)
else: else:
self.progress.set_pass(_('Looking up the names for %d people') % self.numberOfUnrelatedPeople, self.numberOfUnrelatedPeople) self.progress.set_pass(_('Looking up the names for %d people') %
self.numberOfUnrelatedPeople, self.numberOfUnrelatedPeople)
# loop through the entire list of unrelated people # loop through the entire list of unrelated people
for handle in self.handlesOfPeopleNotRelated: for handle in self.handlesOfPeopleNotRelated: