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

Use IMAGE_DIR in geography.py so that map images can be found when running from source directory.

Browse Source 
svn: r21155
This commit is contained in:
John Ralls 2013-01-17 19:48:51 +00:00
parent 3f7d8933c7
commit d9409a8998
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gramps/plugins/lib/maps/geography.py
View File

@ -55,7 +55,7 @@ from gramps.gen.display.name import displayer as _nd
from gramps.gui.views.navigationview import NavigationView from gramps.gui.views.navigationview import NavigationView
from gramps.gen.utils.libformatting import FormattingHelper from gramps.gen.utils.libformatting import FormattingHelper
from gramps.gen.errors import WindowActiveError from gramps.gen.errors import WindowActiveError
from gramps.gen.const import HOME_DIR, ROOT_DIR from gramps.gen.const import HOME_DIR, IMAGE_DIR
from gramps.gui.managedwindow import ManagedWindow from gramps.gui.managedwindow import ManagedWindow
from gramps.gen.config import config from gramps.gen.config import config
from gramps.gui.editors import EditPlace, EditEvent, EditFamily, EditPerson from gramps.gui.editors import EditPlace, EditEvent, EditFamily, EditPerson
@ -149,13 +149,13 @@ class GeoGraphyView(OsmGps, NavigationView):
self.places_found = [] self.places_found = []
self.select_fct = None self.select_fct = None
self.geo_mainmap = None self.geo_mainmap = None
path = os.path.join(ROOT_DIR, "images", "48x48", path = os.path.join(IMAGE_DIR, "48x48",
('gramps-geo-mainmap' + '.png' )) ('gramps-geo-mainmap' + '.png' ))
pathu = path pathu = path
if sys.version_info[0] < 3: if sys.version_info[0] < 3:
pathu = path.encode(glocale.getfilesystemencoding()) pathu = path.encode(glocale.getfilesystemencoding())
self.geo_mainmap = cairo.ImageSurface.create_from_png(pathu) self.geo_mainmap = cairo.ImageSurface.create_from_png(pathu)
path = os.path.join(ROOT_DIR, "images", "48x48", path = os.path.join(IMAGE_DIR, "48x48",
('gramps-geo-altmap' + '.png' )) ('gramps-geo-altmap' + '.png' ))
pathu = path pathu = path
if sys.version_info[0] < 3: if sys.version_info[0] < 3:
@ -172,7 +172,7 @@ class GeoGraphyView(OsmGps, NavigationView):
for ident in ( EventType.BIRTH, for ident in ( EventType.BIRTH,
EventType.DEATH, EventType.DEATH,
EventType.MARRIAGE ): EventType.MARRIAGE ):
path = os.path.join(ROOT_DIR, "images", "48x48", path = os.path.join(IMAGE_DIR, "48x48",
(constants.ICONS.get(int(ident), default_image) + '.png' )) (constants.ICONS.get(int(ident), default_image) + '.png' ))
pathu = path pathu = path
if sys.version_info[0] < 3: if sys.version_info[0] < 3: