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

Some fixes for tabs, and an option to skip saving filename

Browse Source 
svn: r13540
This commit is contained in:
Doug Blank 2009-11-10 05:20:19 +00:00
parent b04b31dbc7
commit 18dede768e
1 changed files with 54 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/ExportAssistant.py
View File

@ -248,14 +248,18 @@ class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) :
""" """
if pagenumber == _ExportAssistant_pages['exporttypes'] : if pagenumber == _ExportAssistant_pages['exporttypes'] :
#decide if options need to be shown: #decide if options need to be shown:
self.option_box_instance = None
ix = self.get_selected_format_index() ix = self.get_selected_format_index()
if self.__exporters[ix].get_config(): if not self.__exporters[ix].get_config():
return pagenumber + 1
else :
# no options needed # no options needed
return pagenumber + 2 return pagenumber + 2
else : elif pagenumber == _ExportAssistant_pages['options']:
return pagenumber + 1 # need to check to see if we should show file selection
if (self.option_box_instance and
hasattr(self.option_box_instance, "no_fileselect")):
# don't show fileselect, but mark it ok
return pagenumber + 2
return pagenumber + 1
def create_options(self): def create_options(self):
"""This method gets the option page, and fills it with the options.""" """This method gets the option page, and fills it with the options."""
@ -435,27 +439,46 @@ class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) :
# Present user with what will happen # Present user with what will happen
ix = self.get_selected_format_index() ix = self.get_selected_format_index()
format = self.__exporters[ix].get_name() format = self.__exporters[ix].get_name()
page_complete = False
#Allow for exotic error: file is still not correct # If no file select:
self.check_fileselect(self.chooser, show=False) if (self.option_box_instance and
if self.get_page_complete(self.chooser) : hasattr(self.option_box_instance, "no_fileselect")):
filename = Utils.get_unicode_path(self.chooser.get_filename()) # No file selection
name = os.path.split(filename)[1] filename = ''
folder = os.path.split(filename)[0]
confirm_text = _( confirm_text = _(
'The data will be saved as follows:\n\n' 'The data will be exported as follows:\n\n'
'Format:\t%s\nName:\t%s\nFolder:\t%s\n\n' 'Format:\t%s\n\n'
'Press Apply to proceed, Back to revisit ' 'Press Apply to proceed, Back to revisit '
'your options, or Cancel to abort') % (format.replace("_",""), name, folder) 'your options, or Cancel to abort') % (format.replace("_",""), )
self.set_page_complete(page, True) page_complete = True
else : else:
confirm_text = _( #Allow for exotic error: file is still not correct
'The selected file and folder to save to ' self.check_fileselect(self.chooser, show=False)
'cannot be created or found.\n\n' if self.get_page_complete(self.chooser) :
'Press Back to return and select a valid filename.' filename = Utils.get_unicode_path(self.chooser.get_filename())
) name = os.path.split(filename)[1]
self.set_page_complete(page, False) folder = os.path.split(filename)[0]
confirm_text = _(
'The data will be saved as follows:\n\n'
'Format:\t%s\nName:\t%s\nFolder:\t%s\n\n'
'Press Apply to proceed, Back to revisit '
'your options, or Cancel to abort') % (format.replace("_",""), name, folder)
page_complete = True
else :
confirm_text = _(
'The selected file and folder to save to '
'cannot be created or found.\n\n'
'Press Back to return and select a valid filename.'
)
page_complete = False
# Set the page_complete status
self.set_page_complete(page, page_complete)
# If it is ok, then look for alternate confirm_text
if (page_complete and
self.option_box_instance and
hasattr(self.option_box_instance, "confirm_text")):
# Override message
confirm_text = self.option_box_instance.confirm_text
page.set_label(confirm_text) page.set_label(confirm_text)
elif self.get_page_type(page) == gtk.ASSISTANT_PAGE_SUMMARY : elif self.get_page_type(page) == gtk.ASSISTANT_PAGE_SUMMARY :
@ -562,8 +585,12 @@ class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) :
Depending on the success status, set the text for the final page. Depending on the success status, set the text for the final page.
""" """
filename = Utils.get_unicode_path(self.chooser.get_filename()) if (self.option_box_instance and
config.set('paths.recent-export-dir', os.path.split(filename)[0]) hasattr(self.option_box_instance, "no_fileselect")):
filename = ""
else:
filename = Utils.get_unicode_path(self.chooser.get_filename())
config.set('paths.recent-export-dir', os.path.split(filename)[0])
ix = self.get_selected_format_index() ix = self.get_selected_format_index()
config.set('behavior.recent-export-type', ix) config.set('behavior.recent-export-type', ix)
export_function = self.__exporters[ix].get_export_function() export_function = self.__exporters[ix].get_export_function()