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

* src/gramps.glade: rearranged filter apply

Browse Source 
* src/gramps.py: update to gtk.main()
* src/gramps_main.py: goto active person after model built


svn: r3116
This commit is contained in:
Don Allingham 2004-05-01 14:08:36 +00:00
parent 5ed94ff9ee
commit 3783102bcc
4 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2004-05-01 Don Allingham <dona@localhost.localdomain>
* src/gramps.glade: rearranged filter apply
* src/gramps.py: update to gtk.main()
* src/gramps_main.py: goto active person after model built
2004-04-29 Don Allingham <dallingham@users.sourceforge.net>
* src/GenericFilter.py: Add a generic filter that can take a
parameter

36
src/gramps.glade
View File

@ -1251,24 +1251,6 @@
<property name="homogeneous">False</property>
<property name="spacing">6</property>
<child>
<widget class="GtkButton" id="apply_filter">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Apply filter using the selected controls</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">_Apply</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_apply_filter_clicked" object="filter"/>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkOptionMenu" id="filter_list">
<property name="width_request">200</property>
@ -1307,6 +1289,24 @@
<property name="fill">True</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="apply_filter">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Apply filter using the selected controls</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">_Apply</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_apply_filter_clicked" object="filter"/>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">6</property>

5
src/gramps.py
View File

@ -94,7 +94,4 @@ except:
import DisplayTrace
DisplayTrace.DisplayTrace()
if gtk.pygtk_version[0] == 2 and gtk.pygtk_version[1] >= 3:
gtk.main()
else:
gtk.mainloop()
gtk.main()

11
src/gramps_main.py
View File

@ -1068,6 +1068,7 @@ class Gramps:
self.topWindow.set_resizable(gtk.TRUE)
self.people_view.apply_filter()
self.goto_active_person()
return 1
def on_ok_button2_clicked(self,obj):
@ -1140,7 +1141,7 @@ class Gramps:
fs_top.cancel_button.connect('clicked',fs_close_window)
fs_top.show()
fs_top.run()
#-------------------------------------------------------------------------
for ObjectId in self.db.get_object_keys():
object = self.db.find_object_from_id(ObjectId)
@ -1570,7 +1571,7 @@ class Gramps:
self.db.set_save_path(name)
res = self.db.get_researcher()
owner = GrampsCfg.get_researcher()
if res.get_name() == "" and owner.get_name():
self.db.set_researcher(owner)
@ -1621,7 +1622,6 @@ class Gramps:
#self.full_update()
self.change_active_person(self.find_initial_person())
self.goto_active_person()
self.statusbar.set_progress_percentage(0.0)
return 1
@ -1784,7 +1784,4 @@ def set_panel(obj):
#-------------------------------------------------------------------------
if __name__ == '__main__':
Gramps(None)
if ver[0] == 2 and ver[1] >= 3:
gtk.main()
else:
gtk.mainloop()
gtk.main()