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

better fix for #4166, #3955

Browse Source 
svn: r15770
This commit is contained in:
Benny Malengier 2010-08-18 21:15:49 +00:00
parent dce76ae6fe
commit fc3ed649f1
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ExportAssistant.py
View File

@ -3,6 +3,7 @@
# #
# Copyright (C) 2004-2007 Donald N. Allingham # Copyright (C) 2004-2007 Donald N. Allingham
# Copyright (C) 2008 Brian G. Matherly # Copyright (C) 2008 Brian G. Matherly
# Copyright (C) 2008 Benny Malengier
# Contribution 2009 by Brad Crittenden <brad [AT] bradcrittenden.net> # Contribution 2009 by Brad Crittenden <brad [AT] bradcrittenden.net>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
@ -115,13 +116,6 @@ class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) :
self.forward_button = None self.forward_button = None
gtk.Assistant.forall(self, self.get_forward_button) gtk.Assistant.forall(self, self.get_forward_button)
## end ## end
##workaround for bug with cancel/close button clicked
##see bug http://www.gramps-project.org/bugs/view.php?id=4166
self.cancel_button = None
gtk.Assistant.forall(self, self.get_cancel_button)
self.close_button = None
gtk.Assistant.forall(self, self.get_close_button)
## end
#set up ManagedWindow #set up ManagedWindow
self.top_title = _("Export Assistant") self.top_title = _("Export Assistant")
@ -406,7 +400,6 @@ class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) :
self.set_page_complete(page, False) self.set_page_complete(page, False)
self.set_page_type(page, gtk.ASSISTANT_PAGE_SUMMARY) self.set_page_type(page, gtk.ASSISTANT_PAGE_SUMMARY)
def do_apply(self): def do_apply(self):
pass pass
@ -414,10 +407,6 @@ class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) :
if self.writestarted : if self.writestarted :
pass pass
else : else :
## avoid bug http://www.gramps-project.org/bugs/view.php?id=4166
self.cancel_button.hide()
self.close_button.hide()
## end
self.close() self.close()
def do_cancel(self): def do_cancel(self):
@ -561,7 +550,7 @@ class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) :
def close(self, *obj) : def close(self, *obj) :
#clean up ManagedWindow menu, then destroy window, bring forward parent #clean up ManagedWindow menu, then destroy window, bring forward parent
gtk.Assistant.destroy(self)
ManagedWindow.ManagedWindow.close(self,*obj) ManagedWindow.ManagedWindow.close(self,*obj)
def get_intro_text(self): def get_intro_text(self):