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

8250 and 9736 : remove patchs. need to found another solution.

Browse Source
This commit is contained in:
SNoiraud 2016-10-21 23:13:24 +02:00
parent 3f83395603
commit e5a7fdc512
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gramps/gui/plug/export/_exportassistant.py
View File

@ -120,7 +120,6 @@ class ExportAssistant(Gtk.Assistant, ManagedWindow) :
#set_window is present in both parent classes #set_window is present in both parent classes
ManagedWindow.set_window(self, self, None, ManagedWindow.set_window(self, self, None,
self.top_title, isWindow=True) self.top_title, isWindow=True)
self.set_modal(True)
#set up callback method for the export plugins #set up callback method for the export plugins
self.callback = self.pulse_progressbar self.callback = self.pulse_progressbar

9
gramps/gui/plug/quick/_textbufdoc.py
View File

@ -53,13 +53,11 @@ LEFT,RIGHT,CENTER = 'LEFT','RIGHT','CENTER'
_WIDTH_IN_CHARS = 72 _WIDTH_IN_CHARS = 72
class DisplayBuf(ManagedWindow): class DisplayBuf(ManagedWindow):
def __init__(self, title, document, modal=False): def __init__(self, title, document):
self.title = title self.title = title
last_managed_window = document.uistate.gwm.window_tree[-1]
ManagedWindow.__init__(self, document.uistate, [], ManagedWindow.__init__(self, document.uistate, [],
document) document)
# We set the parent to the last managed window (transient_for) self.set_window(Gtk.Dialog("",document.uistate.window,
self.set_window(Gtk.Dialog("",last_managed_window,
Gtk.DialogFlags.DESTROY_WITH_PARENT, Gtk.DialogFlags.DESTROY_WITH_PARENT,
(_('_Close'), Gtk.ResponseType.CLOSE)), (_('_Close'), Gtk.ResponseType.CLOSE)),
None, title) None, title)
@ -72,7 +70,6 @@ class DisplayBuf(ManagedWindow):
scrolled_window.add(document.text_view) scrolled_window.add(document.text_view)
self.window.vbox.pack_start(scrolled_window, True, True, 0) self.window.vbox.pack_start(scrolled_window, True, True, 0)
self.window.show_all() self.window.show_all()
self.window.set_modal(modal)
def build_menu_names(self, obj): def build_menu_names(self, obj):
return ('View', _('Quick View')) return ('View', _('Quick View'))
@ -157,7 +154,7 @@ class TextBufDoc(BaseDoc, TextDoc):
if container: if container:
return DocumentManager(_('Quick View'), self, container) return DocumentManager(_('Quick View'), self, container)
else: else:
DisplayBuf(_('Quick View'), self, modal=True) DisplayBuf(_('Quick View'), self)
return return
#-------------------------------------------------------------------- #--------------------------------------------------------------------