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

Merge branch 'bug9872' of git://github.com/prculley/gramps into prculley-bug9872

Browse Source
This commit is contained in:
Paul Franklin 2017-01-01 21:49:50 -08:00
commit 5666441e75
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps/gui/glade/book.glade
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="3.10"/>
<object class="GtkWindow" id="top">
@ -507,8 +507,6 @@
<property name="height_request">300</property>
<property name="can_focus">False</property>
<property name="type_hint">normal</property>
<property name="transient_for">top</property>
<property name="window_position">center</property>>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>

13
gramps/gui/plug/report/_bookdialog.py
View File

@ -147,7 +147,7 @@ class BookListDisplay:
Allows the user to select and/or delete a book from the list.
"""
def __init__(self, booklist, nodelete=False, dosave=False):
def __init__(self, booklist, nodelete=False, dosave=False, parent=None):
"""
Create a BookListDisplay object that displays the books in BookList.
@ -191,6 +191,7 @@ class BookListDisplay:
self.redraw()
self.selection = None
self.top.set_transient_for(parent)
self.top.run()
def redraw(self):
@ -330,7 +331,7 @@ class BookSelector(ManagedWindow):
title_label = self.xml.get_object('title')
self.set_window(window, title_label, self.title)
self.setup_configs('interface.bookselector', 700, 600)
window.show()
self.show()
self.xml.connect_signals({
"on_add_clicked" : self.on_add_clicked,
"on_remove_clicked" : self.on_remove_clicked,
@ -764,8 +765,8 @@ class BookSelector(ManagedWindow):
"""
Run the BookListDisplay dialog to present the choice of books to open.
"""
booklistdisplay = BookListDisplay(self.book_list,
nodelete=True, dosave=False)
booklistdisplay = BookListDisplay(self.book_list, nodelete=True,
dosave=False, parent=self.window)
booklistdisplay.top.destroy()
book = booklistdisplay.selection
if book:
@ -777,8 +778,8 @@ class BookSelector(ManagedWindow):
"""
Run the BookListDisplay dialog to present the choice of books to delete.
"""
booklistdisplay = BookListDisplay(self.book_list,
nodelete=False, dosave=True)
booklistdisplay = BookListDisplay(self.book_list, nodelete=False,
dosave=True, parent=self.window)
booklistdisplay.top.destroy()
book = booklistdisplay.selection
if book: