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

2007-01-30 Don Allingham <don@gramps-project.org>

Browse Source 
* src/ReportBase/_ReportDialog.py: error reporting
	* src/plugins/NarrativeWeb.py: error reporting

	* src/Filters/_SearchBar.py: numlock handling
	* src/Filters/SideBar/_SidebarFilter.py: numlock handling


svn: r8016
This commit is contained in:
Don Allingham 2007-01-31 00:02:15 +00:00
parent ebfafda14c
commit 6fedb61f2f
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gramps2/ChangeLog
View File

@ -1,3 +1,7 @@
2007-01-30 Don Allingham <don@gramps-project.org>
* src/ReportBase/_ReportDialog.py: error reporting
* src/plugins/NarrativeWeb.py: error reporting
2007-01-30 Alex Roitman <shura@gramps-project.org> 2007-01-30 Alex Roitman <shura@gramps-project.org>
* configure.in: Bump up the version. * configure.in: Bump up the version.
@ -8,8 +12,8 @@
2007-01-29 Benny Malengier <benny.malengier@ugent.be> 2007-01-29 Benny Malengier <benny.malengier@ugent.be>
* src/DataViews/_PersonView.py: numlock handling * src/DataViews/_PersonView.py: numlock handling
* src/PageView.py: numlock handling * src/PageView.py: numlock handling
* src/Filters/_SearchBar.py: numblock handling * src/Filters/_SearchBar.py: numlock handling
* src/Filters/SideBar/_SidebarFilter.py: numblock handling * src/Filters/SideBar/_SidebarFilter.py: numlock handling
2007-01-29 Don Allingham <don@gramps-project.org> 2007-01-29 Don Allingham <don@gramps-project.org>
* src/DataViews/_PersonView.py: refactoring * src/DataViews/_PersonView.py: refactoring

3
gramps2/src/ReportBase/_ReportDialog.py
View File

@ -667,6 +667,9 @@ def report(dbstate,uistate,person,report_class,options_class,
elif category in (CATEGORY_BOOK,CATEGORY_CODE,CATEGORY_VIEW,CATEGORY_WEB): elif category in (CATEGORY_BOOK,CATEGORY_CODE,CATEGORY_VIEW,CATEGORY_WEB):
try: try:
report_class(dbstate,uistate,person) report_class(dbstate,uistate,person)
except Error, msg:
ErrorDialog(_("Error generating report"),
str(msg))
except Errors.WindowActiveError: except Errors.WindowActiveError:
pass pass
return return

14
gramps2/src/plugins/NarrativeWeb.py
View File

@ -158,6 +158,7 @@ class BasePage:
self.graphgens = options.handler.options_dict['NWEBgraphgens'] self.graphgens = options.handler.options_dict['NWEBgraphgens']
self.use_home = self.options.handler.options_dict['NWEBhomenote'] != "" self.use_home = self.options.handler.options_dict['NWEBhomenote'] != ""
self.page_title = "" self.page_title = ""
self.warn_dir = True
def store_file(self,archive,html_dir,from_path,to_path): def store_file(self,archive,html_dir,from_path,to_path):
if archive: if archive:
@ -167,7 +168,18 @@ class BasePage:
dirname = os.path.dirname(dest) dirname = os.path.dirname(dest)
if not os.path.isdir(dirname): if not os.path.isdir(dirname):
os.makedirs(dirname) os.makedirs(dirname)
shutil.copyfile(from_path,dest) if from_path != dest:
shutil.copyfile(from_path,dest)
elif self.warn_dir:
WarningDialog(
_("Possible destination error")
_("You appear to have set your target directory "
"to a directory used for data storage. This "
"could create problems with file management. "
"It is recommended that you consider using "
"a different directory to store your generated "
"web pages."))
self.warn_dir = False
def copy_media(self,photo,store_ref=True): def copy_media(self,photo,store_ref=True):