From bb9601a2a028071b03387b263f853b309b71dd29 Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Fri, 4 Jan 2013 23:46:24 +0000 Subject: [PATCH] Move images and data directories. Also svn version code from r20919. svn: r20990 --- {gramps/data => data}/authors.xml | 0 {gramps/data => data}/lds.xml | 0 {gramps/data => data}/papersize.xml | 0 {gramps/data => data}/templates/404.html | 0 {gramps/data => data}/templates/500.html | 0 .../templates/admin/base_site.html | 0 .../data => data}/templates/browse_page.html | 0 .../templates/detail_breadcrumb.html | 0 .../data => data}/templates/gramps-base.html | 0 .../data => data}/templates/main_page.html | 0 .../data => data}/templates/paginator.html | 0 {gramps/data => data}/templates/pick.html | 0 .../data => data}/templates/reference.html | 0 .../templates/registration/login.html | 0 .../data => data}/templates/table_header.html | 0 .../data => data}/templates/user_page.html | 0 .../templates/view_citation_detail.html | 0 .../templates/view_citations.html | 0 .../templates/view_event_detail.html | 0 .../data => data}/templates/view_events.html | 0 .../templates/view_families.html | 0 .../templates/view_family_detail.html | 0 .../data => data}/templates/view_media.html | 0 .../templates/view_media_detail.html | 0 .../templates/view_name_detail.html | 0 .../templates/view_note_detail.html | 0 .../data => data}/templates/view_notes.html | 0 .../data => data}/templates/view_page.html | 0 .../templates/view_page_detail.html | 0 .../data => data}/templates/view_people.html | 0 .../templates/view_person_detail.html | 0 .../templates/view_place_detail.html | 0 .../data => data}/templates/view_places.html | 0 .../data => data}/templates/view_report.html | 0 .../templates/view_report_detail.html | 0 .../templates/view_repositories.html | 0 .../templates/view_repository.html | 0 .../templates/view_repository_detail.html | 0 .../templates/view_source_detail.html | 0 .../data => data}/templates/view_sources.html | 0 .../templates/view_surname_detail.html | 0 {gramps/data => data}/templates/view_tag.html | 0 .../templates/view_tag_detail.html | 0 .../data => data}/templates/view_tags.html | 0 {gramps/data => data}/tips.xml.in | 0 gramps/gen/const.py.in | 99 ++++++++++-------- gramps/gen/svn_revision.py | 42 ++++++++ gramps/gen/utils/svn.py | 67 ------------ .../16x16/geo-fixed-zoom.png | Bin .../images => images}/16x16/geo-free-zoom.png | Bin .../images => images}/16x16/geo-place-add.png | Bin .../16x16/geo-place-link.png | Bin .../16x16/geo-show-event.png | Bin .../16x16/geo-show-family.png | Bin .../16x16/geo-show-person.png | Bin .../16x16/geo-show-place.png | Bin .../16x16/gramps-address.png | Bin .../16x16/gramps-attribute.png | Bin .../16x16/gramps-bookmark-delete.png | Bin .../16x16/gramps-bookmark-edit.png | Bin .../16x16/gramps-bookmark-new.png | Bin .../16x16/gramps-bookmark.png | Bin .../16x16/gramps-citation.png | Bin .../images => images}/16x16/gramps-config.png | Bin .../16x16/gramps-date-edit.png | Bin .../images => images}/16x16/gramps-date.png | Bin .../images => images}/16x16/gramps-event.png | Bin .../images => images}/16x16/gramps-family.png | Bin .../16x16/gramps-fanchart.png | Bin .../16x16/gramps-fanchartdesc.png | Bin .../16x16/gramps-font-bgcolor.png | Bin .../16x16/gramps-font-color.png | Bin .../images => images}/16x16/gramps-font.png | Bin .../images => images}/16x16/gramps-geo.png | Bin .../16x16/gramps-gramplet.png | Bin .../images => images}/16x16/gramps-lock.png | Bin .../images => images}/16x16/gramps-media.png | Bin .../images => images}/16x16/gramps-merge.png | Bin .../images => images}/16x16/gramps-notes.png | Bin .../16x16/gramps-parents-add.png | Bin .../16x16/gramps-parents-open.png | Bin .../16x16/gramps-parents.png | Bin .../16x16/gramps-pedigree.png | Bin .../images => images}/16x16/gramps-person.png | Bin .../images => images}/16x16/gramps-place.png | Bin .../16x16/gramps-relation.png | Bin .../16x16/gramps-reports.png | Bin .../16x16/gramps-repository.png | Bin .../images => images}/16x16/gramps-source.png | Bin .../images => images}/16x16/gramps-spouse.png | Bin .../16x16/gramps-tag-new.png | Bin .../images => images}/16x16/gramps-tag.png | Bin .../images => images}/16x16/gramps-tools.png | Bin .../16x16/gramps-tree-group.png | Bin .../16x16/gramps-tree-list.png | Bin .../16x16/gramps-tree-select.png | Bin .../images => images}/16x16/gramps-unlock.png | Bin .../images => images}/16x16/gramps-view.png | Bin .../16x16/gramps-viewmedia.png | Bin .../16x16/gramps-zoom-best-fit.png | Bin .../16x16/gramps-zoom-fit-width.png | Bin .../16x16/gramps-zoom-in.png | Bin .../16x16/gramps-zoom-out.png | Bin {gramps/images => images}/16x16/gramps.png | Bin .../16x16/source/gramps-geo.svg | 0 .../16x16/source/gramps-tree-group.svg | 0 .../16x16/source/gramps-tree-list.svg | 0 .../16x16/source/gramps-tree-select.svg | 0 .../22x22/geo-fixed-zoom.png | Bin .../images => images}/22x22/geo-free-zoom.png | Bin .../images => images}/22x22/geo-place-add.png | Bin .../22x22/geo-place-link.png | Bin .../22x22/geo-show-event.png | Bin .../22x22/geo-show-family.png | Bin .../22x22/geo-show-person.png | Bin .../22x22/geo-show-place.png | Bin .../22x22/gramps-address.png | Bin .../22x22/gramps-attribute.png | Bin .../22x22/gramps-bookmark-delete.png | Bin .../22x22/gramps-bookmark-edit.png | Bin .../22x22/gramps-bookmark-new.png | Bin .../22x22/gramps-bookmark.png | Bin .../22x22/gramps-citation.png | Bin .../images => images}/22x22/gramps-config.png | Bin .../22x22/gramps-date-edit.png | Bin .../images => images}/22x22/gramps-date.png | Bin .../images => images}/22x22/gramps-event.png | Bin .../images => images}/22x22/gramps-family.png | Bin .../22x22/gramps-fanchart.png | Bin .../22x22/gramps-fanchartdesc.png | Bin .../22x22/gramps-font-bgcolor.png | Bin .../22x22/gramps-font-color.png | Bin .../images => images}/22x22/gramps-font.png | Bin .../22x22/gramps-geo-altmap.png | Bin .../22x22/gramps-geo-birth.png | Bin .../22x22/gramps-geo-death.png | Bin .../22x22/gramps-geo-mainmap.png | Bin .../22x22/gramps-geo-marriage.png | Bin .../images => images}/22x22/gramps-geo.png | Bin .../22x22/gramps-gramplet.png | Bin .../images => images}/22x22/gramps-lock.png | Bin .../images => images}/22x22/gramps-media.png | Bin .../images => images}/22x22/gramps-merge.png | Bin .../images => images}/22x22/gramps-notes.png | Bin .../22x22/gramps-parents-add.png | Bin .../22x22/gramps-parents-open.png | Bin .../22x22/gramps-parents.png | Bin .../22x22/gramps-pedigree.png | Bin .../images => images}/22x22/gramps-person.png | Bin .../images => images}/22x22/gramps-place.png | Bin .../22x22/gramps-relation.png | Bin .../22x22/gramps-reports.png | Bin .../22x22/gramps-repository.png | Bin .../images => images}/22x22/gramps-source.png | Bin .../images => images}/22x22/gramps-spouse.png | Bin .../22x22/gramps-tag-new.png | Bin .../images => images}/22x22/gramps-tag.png | Bin .../images => images}/22x22/gramps-tools.png | Bin .../22x22/gramps-tree-group.png | Bin .../22x22/gramps-tree-list.png | Bin .../22x22/gramps-tree-select.png | Bin .../images => images}/22x22/gramps-unlock.png | Bin .../images => images}/22x22/gramps-view.png | Bin .../22x22/gramps-viewmedia.png | Bin .../22x22/gramps-zoom-best-fit.png | Bin .../22x22/gramps-zoom-fit-width.png | Bin .../22x22/gramps-zoom-in.png | Bin .../22x22/gramps-zoom-out.png | Bin {gramps/images => images}/22x22/gramps.png | Bin .../48x48/geo-fixed-zoom.png | Bin .../images => images}/48x48/geo-free-zoom.png | Bin .../images => images}/48x48/geo-place-add.png | Bin .../48x48/geo-place-link.png | Bin .../48x48/geo-show-event.png | Bin .../48x48/geo-show-family.png | Bin .../48x48/geo-show-person.png | Bin .../48x48/geo-show-place.png | Bin .../48x48/gramps-address.png | Bin .../48x48/gramps-attribute.png | Bin .../48x48/gramps-bookmark-delete.png | Bin .../48x48/gramps-bookmark-edit.png | Bin .../48x48/gramps-bookmark-new.png | Bin .../48x48/gramps-bookmark.png | Bin .../48x48/gramps-citation.png | Bin .../images => images}/48x48/gramps-config.png | Bin .../48x48/gramps-date-edit.png | Bin .../images => images}/48x48/gramps-date.png | Bin .../images => images}/48x48/gramps-event.png | Bin .../images => images}/48x48/gramps-family.png | Bin .../48x48/gramps-fanchart.png | Bin .../48x48/gramps-fanchartdesc.png | Bin .../48x48/gramps-font-bgcolor.png | Bin .../48x48/gramps-font-color.png | Bin .../images => images}/48x48/gramps-font.png | Bin .../48x48/gramps-geo-altmap.png | Bin .../48x48/gramps-geo-birth.png | Bin .../48x48/gramps-geo-death.png | Bin .../48x48/gramps-geo-mainmap.png | Bin .../48x48/gramps-geo-marriage.png | Bin .../images => images}/48x48/gramps-geo.png | Bin .../48x48/gramps-gramplet.png | Bin .../images => images}/48x48/gramps-lock.png | Bin .../images => images}/48x48/gramps-media.png | Bin .../images => images}/48x48/gramps-merge.png | Bin .../images => images}/48x48/gramps-notes.png | Bin .../48x48/gramps-parents-add.png | Bin .../48x48/gramps-parents-open.png | Bin .../48x48/gramps-parents.png | Bin .../48x48/gramps-pedigree.png | Bin .../images => images}/48x48/gramps-person.png | Bin .../images => images}/48x48/gramps-place.png | Bin .../48x48/gramps-relation.png | Bin .../48x48/gramps-reports.png | Bin .../48x48/gramps-repository.png | Bin .../images => images}/48x48/gramps-source.png | Bin .../images => images}/48x48/gramps-spouse.png | Bin .../48x48/gramps-tag-new.png | Bin .../images => images}/48x48/gramps-tag.png | Bin .../images => images}/48x48/gramps-tools.png | Bin .../48x48/gramps-tree-group.png | Bin .../48x48/gramps-tree-list.png | Bin .../48x48/gramps-tree-select.png | Bin .../images => images}/48x48/gramps-unlock.png | Bin .../images => images}/48x48/gramps-view.png | Bin .../48x48/gramps-viewmedia.png | Bin .../48x48/gramps-zoom-best-fit.png | Bin .../48x48/gramps-zoom-fit-width.png | Bin .../48x48/gramps-zoom-in.png | Bin .../48x48/gramps-zoom-out.png | Bin {gramps/images => images}/48x48/gramps.png | Bin {gramps/images => images}/add.png | Bin {gramps/images => images}/bad.png | Bin {gramps/images => images}/caution.png | Bin {gramps/images => images}/document.png | Bin {gramps/images => images}/down.png | Bin {gramps/images => images}/good.png | Bin {gramps/images => images}/gramps-export.png | Bin {gramps/images => images}/gramps-import.png | Bin .../images => images}/gramps-undo-history.png | Bin {gramps/images => images}/gramps-url.png | Bin {gramps/images => images}/gramps.png | Bin {gramps/images => images}/gramps.svg | 0 {gramps/images => images}/gtk-remove.png | Bin {gramps/images => images}/image-missing.png | Bin {gramps/images => images}/logo.png | Bin {gramps/images => images}/next.png | Bin {gramps/images => images}/ped24.ico | Bin {gramps/images => images}/previous.png | Bin .../scalable/add-parent-existing-family.svg | 0 .../scalable/geo-fixed-zoom.svg | 0 .../scalable/geo-free-zoom.svg | 0 .../scalable/geo-place-add.svg | 0 .../scalable/geo-place-link.svg | 0 .../scalable/geo-show-event.svg | 0 .../scalable/geo-show-family.svg | 0 .../scalable/geo-show-person.svg | 0 .../scalable/geo-show-place.svg | 0 .../scalable/gramps-address.svg | 0 .../scalable/gramps-attribute.svg | 0 .../scalable/gramps-bookmark-delete.svg | 0 .../scalable/gramps-bookmark-edit.svg | 0 .../scalable/gramps-bookmark-new.svg | 0 .../scalable/gramps-bookmark.svg | 0 .../scalable/gramps-citation.svg | 0 .../scalable/gramps-config.svg | 0 .../scalable/gramps-date-edit.svg | 0 .../scalable/gramps-date.svg | 0 .../scalable/gramps-event.svg | 0 .../scalable/gramps-family.svg | 0 .../scalable/gramps-fanchart.svg | 0 .../scalable/gramps-fanchartdesc.svg | 0 .../scalable/gramps-font-bgcolor.svg | 0 .../scalable/gramps-font-color.svg | 0 .../scalable/gramps-font.svg | 0 .../scalable/gramps-geo-altmap.svg | 0 .../scalable/gramps-geo-birth.svg | 0 .../scalable/gramps-geo-death.svg | 0 .../scalable/gramps-geo-mainmap.svg | 0 .../scalable/gramps-geo-marriage.svg | 0 .../images => images}/scalable/gramps-geo.svg | 0 .../scalable/gramps-gramplet.svg | 0 .../scalable/gramps-lock.svg | 0 .../scalable/gramps-media.svg | 0 .../scalable/gramps-merge.svg | 0 .../scalable/gramps-notes.svg | 0 .../scalable/gramps-parents-add.svg | 0 .../scalable/gramps-parents-open.svg | 0 .../scalable/gramps-parents.svg | 0 .../scalable/gramps-pedigree.svg | 0 .../scalable/gramps-person.svg | 0 .../scalable/gramps-place.svg | 0 .../scalable/gramps-relation.svg | 0 .../scalable/gramps-reports.svg | 0 .../scalable/gramps-repository.svg | 0 .../scalable/gramps-source.svg | 0 .../scalable/gramps-spouse.svg | 0 .../scalable/gramps-tag-new.svg | 0 .../images => images}/scalable/gramps-tag.svg | 0 .../scalable/gramps-tools.svg | 0 .../scalable/gramps-tree-group.svg | 0 .../scalable/gramps-tree-list.svg | 0 .../scalable/gramps-tree-select.svg | 0 .../scalable/gramps-unlock.svg | 0 .../scalable/gramps-view.svg | 0 .../scalable/gramps-viewmedia.svg | 0 .../scalable/gramps-zoom-best-fit.svg | 0 .../scalable/gramps-zoom-fit-width.svg | 0 .../scalable/gramps-zoom-in.svg | 0 .../scalable/gramps-zoom-out.svg | 0 {gramps/images => images}/scalable/gramps.svg | 0 {gramps/images => images}/splash.jpg | Bin {gramps/images => images}/stock_index_24.png | Bin {gramps/images => images}/stock_link.png | Bin {gramps/images => images}/stock_new-html.png | Bin {gramps/images => images}/stock_notes.png | Bin {gramps/images => images}/text-editor.png | Bin {gramps/images => images}/up.png | Bin setup.py | 37 ++++--- 318 files changed, 116 insertions(+), 129 deletions(-) rename {gramps/data => data}/authors.xml (100%) rename {gramps/data => data}/lds.xml (100%) rename {gramps/data => data}/papersize.xml (100%) rename {gramps/data => data}/templates/404.html (100%) rename {gramps/data => data}/templates/500.html (100%) rename {gramps/data => data}/templates/admin/base_site.html (100%) rename {gramps/data => data}/templates/browse_page.html (100%) rename {gramps/data => data}/templates/detail_breadcrumb.html (100%) rename {gramps/data => data}/templates/gramps-base.html (100%) rename {gramps/data => data}/templates/main_page.html (100%) rename {gramps/data => data}/templates/paginator.html (100%) rename {gramps/data => data}/templates/pick.html (100%) rename {gramps/data => data}/templates/reference.html (100%) rename {gramps/data => data}/templates/registration/login.html (100%) rename {gramps/data => data}/templates/table_header.html (100%) rename {gramps/data => data}/templates/user_page.html (100%) rename {gramps/data => data}/templates/view_citation_detail.html (100%) rename {gramps/data => data}/templates/view_citations.html (100%) rename {gramps/data => data}/templates/view_event_detail.html (100%) rename {gramps/data => data}/templates/view_events.html (100%) rename {gramps/data => data}/templates/view_families.html (100%) rename {gramps/data => data}/templates/view_family_detail.html (100%) rename {gramps/data => data}/templates/view_media.html (100%) rename {gramps/data => data}/templates/view_media_detail.html (100%) rename {gramps/data => data}/templates/view_name_detail.html (100%) rename {gramps/data => data}/templates/view_note_detail.html (100%) rename {gramps/data => data}/templates/view_notes.html (100%) rename {gramps/data => data}/templates/view_page.html (100%) rename {gramps/data => data}/templates/view_page_detail.html (100%) rename {gramps/data => data}/templates/view_people.html (100%) rename {gramps/data => data}/templates/view_person_detail.html (100%) rename {gramps/data => data}/templates/view_place_detail.html (100%) rename {gramps/data => data}/templates/view_places.html (100%) rename {gramps/data => data}/templates/view_report.html (100%) rename {gramps/data => data}/templates/view_report_detail.html (100%) rename {gramps/data => data}/templates/view_repositories.html (100%) rename {gramps/data => data}/templates/view_repository.html (100%) rename {gramps/data => data}/templates/view_repository_detail.html (100%) rename {gramps/data => data}/templates/view_source_detail.html (100%) rename {gramps/data => data}/templates/view_sources.html (100%) rename {gramps/data => data}/templates/view_surname_detail.html (100%) rename {gramps/data => data}/templates/view_tag.html (100%) rename {gramps/data => data}/templates/view_tag_detail.html (100%) rename {gramps/data => data}/templates/view_tags.html (100%) rename {gramps/data => data}/tips.xml.in (100%) create mode 100644 gramps/gen/svn_revision.py delete mode 100644 gramps/gen/utils/svn.py rename {gramps/images => images}/16x16/geo-fixed-zoom.png (100%) rename {gramps/images => images}/16x16/geo-free-zoom.png (100%) rename {gramps/images => images}/16x16/geo-place-add.png (100%) rename {gramps/images => images}/16x16/geo-place-link.png (100%) rename {gramps/images => images}/16x16/geo-show-event.png (100%) rename {gramps/images => images}/16x16/geo-show-family.png (100%) rename {gramps/images => images}/16x16/geo-show-person.png (100%) rename {gramps/images => images}/16x16/geo-show-place.png (100%) rename {gramps/images => images}/16x16/gramps-address.png (100%) rename {gramps/images => images}/16x16/gramps-attribute.png (100%) rename {gramps/images => images}/16x16/gramps-bookmark-delete.png (100%) rename {gramps/images => images}/16x16/gramps-bookmark-edit.png (100%) rename {gramps/images => images}/16x16/gramps-bookmark-new.png (100%) rename {gramps/images => images}/16x16/gramps-bookmark.png (100%) rename {gramps/images => images}/16x16/gramps-citation.png (100%) rename {gramps/images => images}/16x16/gramps-config.png (100%) rename {gramps/images => images}/16x16/gramps-date-edit.png (100%) rename {gramps/images => images}/16x16/gramps-date.png (100%) rename {gramps/images => images}/16x16/gramps-event.png (100%) rename {gramps/images => images}/16x16/gramps-family.png (100%) rename {gramps/images => images}/16x16/gramps-fanchart.png (100%) rename {gramps/images => images}/16x16/gramps-fanchartdesc.png (100%) rename {gramps/images => images}/16x16/gramps-font-bgcolor.png (100%) rename {gramps/images => images}/16x16/gramps-font-color.png (100%) rename {gramps/images => images}/16x16/gramps-font.png (100%) rename {gramps/images => images}/16x16/gramps-geo.png (100%) rename {gramps/images => images}/16x16/gramps-gramplet.png (100%) rename {gramps/images => images}/16x16/gramps-lock.png (100%) rename {gramps/images => images}/16x16/gramps-media.png (100%) rename {gramps/images => images}/16x16/gramps-merge.png (100%) rename {gramps/images => images}/16x16/gramps-notes.png (100%) rename {gramps/images => images}/16x16/gramps-parents-add.png (100%) rename {gramps/images => images}/16x16/gramps-parents-open.png (100%) rename {gramps/images => images}/16x16/gramps-parents.png (100%) rename {gramps/images => images}/16x16/gramps-pedigree.png (100%) rename {gramps/images => images}/16x16/gramps-person.png (100%) rename {gramps/images => images}/16x16/gramps-place.png (100%) rename {gramps/images => images}/16x16/gramps-relation.png (100%) rename {gramps/images => images}/16x16/gramps-reports.png (100%) rename {gramps/images => images}/16x16/gramps-repository.png (100%) rename {gramps/images => images}/16x16/gramps-source.png (100%) rename {gramps/images => images}/16x16/gramps-spouse.png (100%) rename {gramps/images => images}/16x16/gramps-tag-new.png (100%) rename {gramps/images => images}/16x16/gramps-tag.png (100%) rename {gramps/images => images}/16x16/gramps-tools.png (100%) rename {gramps/images => images}/16x16/gramps-tree-group.png (100%) rename {gramps/images => images}/16x16/gramps-tree-list.png (100%) rename {gramps/images => images}/16x16/gramps-tree-select.png (100%) rename {gramps/images => images}/16x16/gramps-unlock.png (100%) rename {gramps/images => images}/16x16/gramps-view.png (100%) rename {gramps/images => images}/16x16/gramps-viewmedia.png (100%) rename {gramps/images => images}/16x16/gramps-zoom-best-fit.png (100%) rename {gramps/images => images}/16x16/gramps-zoom-fit-width.png (100%) rename {gramps/images => images}/16x16/gramps-zoom-in.png (100%) rename {gramps/images => images}/16x16/gramps-zoom-out.png (100%) rename {gramps/images => images}/16x16/gramps.png (100%) rename {gramps/images => images}/16x16/source/gramps-geo.svg (100%) rename {gramps/images => images}/16x16/source/gramps-tree-group.svg (100%) rename {gramps/images => images}/16x16/source/gramps-tree-list.svg (100%) rename {gramps/images => images}/16x16/source/gramps-tree-select.svg (100%) rename {gramps/images => images}/22x22/geo-fixed-zoom.png (100%) rename {gramps/images => images}/22x22/geo-free-zoom.png (100%) rename {gramps/images => images}/22x22/geo-place-add.png (100%) rename {gramps/images => images}/22x22/geo-place-link.png (100%) rename {gramps/images => images}/22x22/geo-show-event.png (100%) rename {gramps/images => images}/22x22/geo-show-family.png (100%) rename {gramps/images => images}/22x22/geo-show-person.png (100%) rename {gramps/images => images}/22x22/geo-show-place.png (100%) rename {gramps/images => images}/22x22/gramps-address.png (100%) rename {gramps/images => images}/22x22/gramps-attribute.png (100%) rename {gramps/images => images}/22x22/gramps-bookmark-delete.png (100%) rename {gramps/images => images}/22x22/gramps-bookmark-edit.png (100%) rename {gramps/images => images}/22x22/gramps-bookmark-new.png (100%) rename {gramps/images => images}/22x22/gramps-bookmark.png (100%) rename {gramps/images => images}/22x22/gramps-citation.png (100%) rename {gramps/images => images}/22x22/gramps-config.png (100%) rename {gramps/images => images}/22x22/gramps-date-edit.png (100%) rename {gramps/images => images}/22x22/gramps-date.png (100%) rename {gramps/images => images}/22x22/gramps-event.png (100%) rename {gramps/images => images}/22x22/gramps-family.png (100%) rename {gramps/images => images}/22x22/gramps-fanchart.png (100%) rename {gramps/images => images}/22x22/gramps-fanchartdesc.png (100%) rename {gramps/images => images}/22x22/gramps-font-bgcolor.png (100%) rename {gramps/images => images}/22x22/gramps-font-color.png (100%) rename {gramps/images => images}/22x22/gramps-font.png (100%) rename {gramps/images => images}/22x22/gramps-geo-altmap.png (100%) rename {gramps/images => images}/22x22/gramps-geo-birth.png (100%) rename {gramps/images => images}/22x22/gramps-geo-death.png (100%) rename {gramps/images => images}/22x22/gramps-geo-mainmap.png (100%) rename {gramps/images => images}/22x22/gramps-geo-marriage.png (100%) rename {gramps/images => images}/22x22/gramps-geo.png (100%) rename {gramps/images => images}/22x22/gramps-gramplet.png (100%) rename {gramps/images => images}/22x22/gramps-lock.png (100%) rename {gramps/images => images}/22x22/gramps-media.png (100%) rename {gramps/images => images}/22x22/gramps-merge.png (100%) rename {gramps/images => images}/22x22/gramps-notes.png (100%) rename {gramps/images => images}/22x22/gramps-parents-add.png (100%) rename {gramps/images => images}/22x22/gramps-parents-open.png (100%) rename {gramps/images => images}/22x22/gramps-parents.png (100%) rename {gramps/images => images}/22x22/gramps-pedigree.png (100%) rename {gramps/images => images}/22x22/gramps-person.png (100%) rename {gramps/images => images}/22x22/gramps-place.png (100%) rename {gramps/images => images}/22x22/gramps-relation.png (100%) rename {gramps/images => images}/22x22/gramps-reports.png (100%) rename {gramps/images => images}/22x22/gramps-repository.png (100%) rename {gramps/images => images}/22x22/gramps-source.png (100%) rename {gramps/images => images}/22x22/gramps-spouse.png (100%) rename {gramps/images => images}/22x22/gramps-tag-new.png (100%) rename {gramps/images => images}/22x22/gramps-tag.png (100%) rename {gramps/images => images}/22x22/gramps-tools.png (100%) rename {gramps/images => images}/22x22/gramps-tree-group.png (100%) rename {gramps/images => images}/22x22/gramps-tree-list.png (100%) rename {gramps/images => images}/22x22/gramps-tree-select.png (100%) rename {gramps/images => images}/22x22/gramps-unlock.png (100%) rename {gramps/images => images}/22x22/gramps-view.png (100%) rename {gramps/images => images}/22x22/gramps-viewmedia.png (100%) rename {gramps/images => images}/22x22/gramps-zoom-best-fit.png (100%) rename {gramps/images => images}/22x22/gramps-zoom-fit-width.png (100%) rename {gramps/images => images}/22x22/gramps-zoom-in.png (100%) rename {gramps/images => images}/22x22/gramps-zoom-out.png (100%) rename {gramps/images => images}/22x22/gramps.png (100%) rename {gramps/images => images}/48x48/geo-fixed-zoom.png (100%) rename {gramps/images => images}/48x48/geo-free-zoom.png (100%) rename {gramps/images => images}/48x48/geo-place-add.png (100%) rename {gramps/images => images}/48x48/geo-place-link.png (100%) rename {gramps/images => images}/48x48/geo-show-event.png (100%) rename {gramps/images => images}/48x48/geo-show-family.png (100%) rename {gramps/images => images}/48x48/geo-show-person.png (100%) rename {gramps/images => images}/48x48/geo-show-place.png (100%) rename {gramps/images => images}/48x48/gramps-address.png (100%) rename {gramps/images => images}/48x48/gramps-attribute.png (100%) rename {gramps/images => images}/48x48/gramps-bookmark-delete.png (100%) rename {gramps/images => images}/48x48/gramps-bookmark-edit.png (100%) rename {gramps/images => images}/48x48/gramps-bookmark-new.png (100%) rename {gramps/images => images}/48x48/gramps-bookmark.png (100%) rename {gramps/images => images}/48x48/gramps-citation.png (100%) rename {gramps/images => images}/48x48/gramps-config.png (100%) rename {gramps/images => images}/48x48/gramps-date-edit.png (100%) rename {gramps/images => images}/48x48/gramps-date.png (100%) rename {gramps/images => images}/48x48/gramps-event.png (100%) rename {gramps/images => images}/48x48/gramps-family.png (100%) rename {gramps/images => images}/48x48/gramps-fanchart.png (100%) rename {gramps/images => images}/48x48/gramps-fanchartdesc.png (100%) rename {gramps/images => images}/48x48/gramps-font-bgcolor.png (100%) rename {gramps/images => images}/48x48/gramps-font-color.png (100%) rename {gramps/images => images}/48x48/gramps-font.png (100%) rename {gramps/images => images}/48x48/gramps-geo-altmap.png (100%) rename {gramps/images => images}/48x48/gramps-geo-birth.png (100%) rename {gramps/images => images}/48x48/gramps-geo-death.png (100%) rename {gramps/images => images}/48x48/gramps-geo-mainmap.png (100%) rename {gramps/images => images}/48x48/gramps-geo-marriage.png (100%) rename {gramps/images => images}/48x48/gramps-geo.png (100%) rename {gramps/images => images}/48x48/gramps-gramplet.png (100%) rename {gramps/images => images}/48x48/gramps-lock.png (100%) rename {gramps/images => images}/48x48/gramps-media.png (100%) rename {gramps/images => images}/48x48/gramps-merge.png (100%) rename {gramps/images => images}/48x48/gramps-notes.png (100%) rename {gramps/images => images}/48x48/gramps-parents-add.png (100%) rename {gramps/images => images}/48x48/gramps-parents-open.png (100%) rename {gramps/images => images}/48x48/gramps-parents.png (100%) rename {gramps/images => images}/48x48/gramps-pedigree.png (100%) rename {gramps/images => images}/48x48/gramps-person.png (100%) rename {gramps/images => images}/48x48/gramps-place.png (100%) rename {gramps/images => images}/48x48/gramps-relation.png (100%) rename {gramps/images => images}/48x48/gramps-reports.png (100%) rename {gramps/images => images}/48x48/gramps-repository.png (100%) rename {gramps/images => images}/48x48/gramps-source.png (100%) rename {gramps/images => images}/48x48/gramps-spouse.png (100%) rename {gramps/images => images}/48x48/gramps-tag-new.png (100%) rename {gramps/images => images}/48x48/gramps-tag.png (100%) rename {gramps/images => images}/48x48/gramps-tools.png (100%) rename {gramps/images => images}/48x48/gramps-tree-group.png (100%) rename {gramps/images => images}/48x48/gramps-tree-list.png (100%) rename {gramps/images => images}/48x48/gramps-tree-select.png (100%) rename {gramps/images => images}/48x48/gramps-unlock.png (100%) rename {gramps/images => images}/48x48/gramps-view.png (100%) rename {gramps/images => images}/48x48/gramps-viewmedia.png (100%) rename {gramps/images => images}/48x48/gramps-zoom-best-fit.png (100%) rename {gramps/images => images}/48x48/gramps-zoom-fit-width.png (100%) rename {gramps/images => images}/48x48/gramps-zoom-in.png (100%) rename {gramps/images => images}/48x48/gramps-zoom-out.png (100%) rename {gramps/images => images}/48x48/gramps.png (100%) rename {gramps/images => images}/add.png (100%) rename {gramps/images => images}/bad.png (100%) rename {gramps/images => images}/caution.png (100%) rename {gramps/images => images}/document.png (100%) rename {gramps/images => images}/down.png (100%) rename {gramps/images => images}/good.png (100%) rename {gramps/images => images}/gramps-export.png (100%) rename {gramps/images => images}/gramps-import.png (100%) rename {gramps/images => images}/gramps-undo-history.png (100%) rename {gramps/images => images}/gramps-url.png (100%) rename {gramps/images => images}/gramps.png (100%) rename {gramps/images => images}/gramps.svg (100%) rename {gramps/images => images}/gtk-remove.png (100%) rename {gramps/images => images}/image-missing.png (100%) rename {gramps/images => images}/logo.png (100%) rename {gramps/images => images}/next.png (100%) rename {gramps/images => images}/ped24.ico (100%) rename {gramps/images => images}/previous.png (100%) rename {gramps/images => images}/scalable/add-parent-existing-family.svg (100%) rename {gramps/images => images}/scalable/geo-fixed-zoom.svg (100%) rename {gramps/images => images}/scalable/geo-free-zoom.svg (100%) rename {gramps/images => images}/scalable/geo-place-add.svg (100%) rename {gramps/images => images}/scalable/geo-place-link.svg (100%) rename {gramps/images => images}/scalable/geo-show-event.svg (100%) rename {gramps/images => images}/scalable/geo-show-family.svg (100%) rename {gramps/images => images}/scalable/geo-show-person.svg (100%) rename {gramps/images => images}/scalable/geo-show-place.svg (100%) rename {gramps/images => images}/scalable/gramps-address.svg (100%) rename {gramps/images => images}/scalable/gramps-attribute.svg (100%) rename {gramps/images => images}/scalable/gramps-bookmark-delete.svg (100%) rename {gramps/images => images}/scalable/gramps-bookmark-edit.svg (100%) rename {gramps/images => images}/scalable/gramps-bookmark-new.svg (100%) rename {gramps/images => images}/scalable/gramps-bookmark.svg (100%) rename {gramps/images => images}/scalable/gramps-citation.svg (100%) rename {gramps/images => images}/scalable/gramps-config.svg (100%) rename {gramps/images => images}/scalable/gramps-date-edit.svg (100%) rename {gramps/images => images}/scalable/gramps-date.svg (100%) rename {gramps/images => images}/scalable/gramps-event.svg (100%) rename {gramps/images => images}/scalable/gramps-family.svg (100%) rename {gramps/images => images}/scalable/gramps-fanchart.svg (100%) rename {gramps/images => images}/scalable/gramps-fanchartdesc.svg (100%) rename {gramps/images => images}/scalable/gramps-font-bgcolor.svg (100%) rename {gramps/images => images}/scalable/gramps-font-color.svg (100%) rename {gramps/images => images}/scalable/gramps-font.svg (100%) rename {gramps/images => images}/scalable/gramps-geo-altmap.svg (100%) rename {gramps/images => images}/scalable/gramps-geo-birth.svg (100%) rename {gramps/images => images}/scalable/gramps-geo-death.svg (100%) rename {gramps/images => images}/scalable/gramps-geo-mainmap.svg (100%) rename {gramps/images => images}/scalable/gramps-geo-marriage.svg (100%) rename {gramps/images => images}/scalable/gramps-geo.svg (100%) rename {gramps/images => images}/scalable/gramps-gramplet.svg (100%) rename {gramps/images => images}/scalable/gramps-lock.svg (100%) rename {gramps/images => images}/scalable/gramps-media.svg (100%) rename {gramps/images => images}/scalable/gramps-merge.svg (100%) rename {gramps/images => images}/scalable/gramps-notes.svg (100%) rename {gramps/images => images}/scalable/gramps-parents-add.svg (100%) rename {gramps/images => images}/scalable/gramps-parents-open.svg (100%) rename {gramps/images => images}/scalable/gramps-parents.svg (100%) rename {gramps/images => images}/scalable/gramps-pedigree.svg (100%) rename {gramps/images => images}/scalable/gramps-person.svg (100%) rename {gramps/images => images}/scalable/gramps-place.svg (100%) rename {gramps/images => images}/scalable/gramps-relation.svg (100%) rename {gramps/images => images}/scalable/gramps-reports.svg (100%) rename {gramps/images => images}/scalable/gramps-repository.svg (100%) rename {gramps/images => images}/scalable/gramps-source.svg (100%) rename {gramps/images => images}/scalable/gramps-spouse.svg (100%) rename {gramps/images => images}/scalable/gramps-tag-new.svg (100%) rename {gramps/images => images}/scalable/gramps-tag.svg (100%) rename {gramps/images => images}/scalable/gramps-tools.svg (100%) rename {gramps/images => images}/scalable/gramps-tree-group.svg (100%) rename {gramps/images => images}/scalable/gramps-tree-list.svg (100%) rename {gramps/images => images}/scalable/gramps-tree-select.svg (100%) rename {gramps/images => images}/scalable/gramps-unlock.svg (100%) rename {gramps/images => images}/scalable/gramps-view.svg (100%) rename {gramps/images => images}/scalable/gramps-viewmedia.svg (100%) rename {gramps/images => images}/scalable/gramps-zoom-best-fit.svg (100%) rename {gramps/images => images}/scalable/gramps-zoom-fit-width.svg (100%) rename {gramps/images => images}/scalable/gramps-zoom-in.svg (100%) rename {gramps/images => images}/scalable/gramps-zoom-out.svg (100%) rename {gramps/images => images}/scalable/gramps.svg (100%) rename {gramps/images => images}/splash.jpg (100%) rename {gramps/images => images}/stock_index_24.png (100%) rename {gramps/images => images}/stock_link.png (100%) rename {gramps/images => images}/stock_new-html.png (100%) rename {gramps/images => images}/stock_notes.png (100%) rename {gramps/images => images}/text-editor.png (100%) rename {gramps/images => images}/up.png (100%) diff --git a/gramps/data/authors.xml b/data/authors.xml similarity index 100% rename from gramps/data/authors.xml rename to data/authors.xml diff --git a/gramps/data/lds.xml b/data/lds.xml similarity index 100% rename from gramps/data/lds.xml rename to data/lds.xml diff --git a/gramps/data/papersize.xml b/data/papersize.xml similarity index 100% rename from gramps/data/papersize.xml rename to data/papersize.xml diff --git a/gramps/data/templates/404.html b/data/templates/404.html similarity index 100% rename from gramps/data/templates/404.html rename to data/templates/404.html diff --git a/gramps/data/templates/500.html b/data/templates/500.html similarity index 100% rename from gramps/data/templates/500.html rename to data/templates/500.html diff --git a/gramps/data/templates/admin/base_site.html b/data/templates/admin/base_site.html similarity index 100% rename from gramps/data/templates/admin/base_site.html rename to data/templates/admin/base_site.html diff --git a/gramps/data/templates/browse_page.html b/data/templates/browse_page.html similarity index 100% rename from gramps/data/templates/browse_page.html rename to data/templates/browse_page.html diff --git a/gramps/data/templates/detail_breadcrumb.html b/data/templates/detail_breadcrumb.html similarity index 100% rename from gramps/data/templates/detail_breadcrumb.html rename to data/templates/detail_breadcrumb.html diff --git a/gramps/data/templates/gramps-base.html b/data/templates/gramps-base.html similarity index 100% rename from gramps/data/templates/gramps-base.html rename to data/templates/gramps-base.html diff --git a/gramps/data/templates/main_page.html b/data/templates/main_page.html similarity index 100% rename from gramps/data/templates/main_page.html rename to data/templates/main_page.html diff --git a/gramps/data/templates/paginator.html b/data/templates/paginator.html similarity index 100% rename from gramps/data/templates/paginator.html rename to data/templates/paginator.html diff --git a/gramps/data/templates/pick.html b/data/templates/pick.html similarity index 100% rename from gramps/data/templates/pick.html rename to data/templates/pick.html diff --git a/gramps/data/templates/reference.html b/data/templates/reference.html similarity index 100% rename from gramps/data/templates/reference.html rename to data/templates/reference.html diff --git a/gramps/data/templates/registration/login.html b/data/templates/registration/login.html similarity index 100% rename from gramps/data/templates/registration/login.html rename to data/templates/registration/login.html diff --git a/gramps/data/templates/table_header.html b/data/templates/table_header.html similarity index 100% rename from gramps/data/templates/table_header.html rename to data/templates/table_header.html diff --git a/gramps/data/templates/user_page.html b/data/templates/user_page.html similarity index 100% rename from gramps/data/templates/user_page.html rename to data/templates/user_page.html diff --git a/gramps/data/templates/view_citation_detail.html b/data/templates/view_citation_detail.html similarity index 100% rename from gramps/data/templates/view_citation_detail.html rename to data/templates/view_citation_detail.html diff --git a/gramps/data/templates/view_citations.html b/data/templates/view_citations.html similarity index 100% rename from gramps/data/templates/view_citations.html rename to data/templates/view_citations.html diff --git a/gramps/data/templates/view_event_detail.html b/data/templates/view_event_detail.html similarity index 100% rename from gramps/data/templates/view_event_detail.html rename to data/templates/view_event_detail.html diff --git a/gramps/data/templates/view_events.html b/data/templates/view_events.html similarity index 100% rename from gramps/data/templates/view_events.html rename to data/templates/view_events.html diff --git a/gramps/data/templates/view_families.html b/data/templates/view_families.html similarity index 100% rename from gramps/data/templates/view_families.html rename to data/templates/view_families.html diff --git a/gramps/data/templates/view_family_detail.html b/data/templates/view_family_detail.html similarity index 100% rename from gramps/data/templates/view_family_detail.html rename to data/templates/view_family_detail.html diff --git a/gramps/data/templates/view_media.html b/data/templates/view_media.html similarity index 100% rename from gramps/data/templates/view_media.html rename to data/templates/view_media.html diff --git a/gramps/data/templates/view_media_detail.html b/data/templates/view_media_detail.html similarity index 100% rename from gramps/data/templates/view_media_detail.html rename to data/templates/view_media_detail.html diff --git a/gramps/data/templates/view_name_detail.html b/data/templates/view_name_detail.html similarity index 100% rename from gramps/data/templates/view_name_detail.html rename to data/templates/view_name_detail.html diff --git a/gramps/data/templates/view_note_detail.html b/data/templates/view_note_detail.html similarity index 100% rename from gramps/data/templates/view_note_detail.html rename to data/templates/view_note_detail.html diff --git a/gramps/data/templates/view_notes.html b/data/templates/view_notes.html similarity index 100% rename from gramps/data/templates/view_notes.html rename to data/templates/view_notes.html diff --git a/gramps/data/templates/view_page.html b/data/templates/view_page.html similarity index 100% rename from gramps/data/templates/view_page.html rename to data/templates/view_page.html diff --git a/gramps/data/templates/view_page_detail.html b/data/templates/view_page_detail.html similarity index 100% rename from gramps/data/templates/view_page_detail.html rename to data/templates/view_page_detail.html diff --git a/gramps/data/templates/view_people.html b/data/templates/view_people.html similarity index 100% rename from gramps/data/templates/view_people.html rename to data/templates/view_people.html diff --git a/gramps/data/templates/view_person_detail.html b/data/templates/view_person_detail.html similarity index 100% rename from gramps/data/templates/view_person_detail.html rename to data/templates/view_person_detail.html diff --git a/gramps/data/templates/view_place_detail.html b/data/templates/view_place_detail.html similarity index 100% rename from gramps/data/templates/view_place_detail.html rename to data/templates/view_place_detail.html diff --git a/gramps/data/templates/view_places.html b/data/templates/view_places.html similarity index 100% rename from gramps/data/templates/view_places.html rename to data/templates/view_places.html diff --git a/gramps/data/templates/view_report.html b/data/templates/view_report.html similarity index 100% rename from gramps/data/templates/view_report.html rename to data/templates/view_report.html diff --git a/gramps/data/templates/view_report_detail.html b/data/templates/view_report_detail.html similarity index 100% rename from gramps/data/templates/view_report_detail.html rename to data/templates/view_report_detail.html diff --git a/gramps/data/templates/view_repositories.html b/data/templates/view_repositories.html similarity index 100% rename from gramps/data/templates/view_repositories.html rename to data/templates/view_repositories.html diff --git a/gramps/data/templates/view_repository.html b/data/templates/view_repository.html similarity index 100% rename from gramps/data/templates/view_repository.html rename to data/templates/view_repository.html diff --git a/gramps/data/templates/view_repository_detail.html b/data/templates/view_repository_detail.html similarity index 100% rename from gramps/data/templates/view_repository_detail.html rename to data/templates/view_repository_detail.html diff --git a/gramps/data/templates/view_source_detail.html b/data/templates/view_source_detail.html similarity index 100% rename from gramps/data/templates/view_source_detail.html rename to data/templates/view_source_detail.html diff --git a/gramps/data/templates/view_sources.html b/data/templates/view_sources.html similarity index 100% rename from gramps/data/templates/view_sources.html rename to data/templates/view_sources.html diff --git a/gramps/data/templates/view_surname_detail.html b/data/templates/view_surname_detail.html similarity index 100% rename from gramps/data/templates/view_surname_detail.html rename to data/templates/view_surname_detail.html diff --git a/gramps/data/templates/view_tag.html b/data/templates/view_tag.html similarity index 100% rename from gramps/data/templates/view_tag.html rename to data/templates/view_tag.html diff --git a/gramps/data/templates/view_tag_detail.html b/data/templates/view_tag_detail.html similarity index 100% rename from gramps/data/templates/view_tag_detail.html rename to data/templates/view_tag_detail.html diff --git a/gramps/data/templates/view_tags.html b/data/templates/view_tags.html similarity index 100% rename from gramps/data/templates/view_tags.html rename to data/templates/view_tags.html diff --git a/gramps/data/tips.xml.in b/data/tips.xml.in similarity index 100% rename from gramps/data/tips.xml.in rename to data/tips.xml.in diff --git a/gramps/gen/const.py.in b/gramps/gen/const.py.in index 3416e736d..8d29c7ca4 100644 --- a/gramps/gen/const.py.in +++ b/gramps/gen/const.py.in @@ -43,6 +43,7 @@ import uuid # #------------------------------------------------------------------------- from .ggettext import sgettext as _ +from .svn_revision import get_svn_revision #------------------------------------------------------------------------- # @@ -50,11 +51,12 @@ from .ggettext import sgettext as _ # #------------------------------------------------------------------------- PROGRAM_NAME = "Gramps" -if "@VERSIONSTRING@" == "@" + "VERSIONSTRING" + "@": - VERSION = "4.0.0" -else: - VERSION = "@VERSIONSTRING@" -VERSION_TUPLE = (4, 0, 0) +VERSION = "@VERSIONSTRING@" +if VERSION == "@" + "VERSIONSTRING" + "@": + raise Exception("Please run 'python setup.py build'") +VERSION_TUPLE = tuple(map(int, VERSION.split("."))) +major_version = "%s.%s" % (VERSION_TUPLE[0], VERSION_TUPLE[1]) +VERSION += get_svn_revision() #------------------------------------------------------------------------- # @@ -65,11 +67,11 @@ URL_HOMEPAGE = "http://gramps-project.org/" URL_MAILINGLIST = "http://sourceforge.net/mail/?group_id=25770" URL_BUGTRACKER = "http://bugs.gramps-project.org/bug_report_advanced_page.php" URL_WIKISTRING = "http://gramps-project.org/wiki/index.php?title=" -URL_MANUAL_PAGE = "Gramps_4.0_Wiki_Manual" +URL_MANUAL_PAGE = "Gramps_%s_Wiki_Manual" % major_version WIKI_FAQ = "FAQ" -WIKI_KEYBINDINGS = "Gramps_4.0_Wiki_Manual_-_Keybindings" -WIKI_EXTRAPLUGINS= "4.0_Addons" -WIKI_EXTRAPLUGINS_RAWDATA = "Plugins4.0&action=raw" +WIKI_KEYBINDINGS = "Gramps_%s_Wiki_Manual_-_Keybindings" % major_version +WIKI_EXTRAPLUGINS= "%s_Addons" % major_version +WIKI_EXTRAPLUGINS_RAWDATA = "Plugins%s&action=raw" % major_version #------------------------------------------------------------------------- # @@ -84,13 +86,6 @@ APP_GRAMPS_PKG = "application/x-gramps-package" APP_GENEWEB = "application/x-geneweb" APP_VCARD = ["text/x-vcard", "text/x-vcalendar"] -#------------------------------------------------------------------------- -# -# system paths -# -#------------------------------------------------------------------------- -LOCALE_DIR = "@LOCALE_DIR@" - #------------------------------------------------------------------------- # # Platforms @@ -133,24 +128,6 @@ if sys.version_info[0] < 3: else: pass -#------------------------------------------------------------------------- -# -# Paths to files - assumes that files reside in the same directory as -# this one, and that the plugins directory is in a directory below this. -# -#------------------------------------------------------------------------- -ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname( - __file__), os.pardir)) -if sys.version_info[0] < 3: - # test for sys.frozen to detect a py2exe executable on Windows - if hasattr(sys, "frozen"): - ROOT_DIR = os.path.abspath(os.path.dirname( - unicode(sys.executable, sys.getfilesystemencoding()))) - else: - ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname( - unicode(__file__, sys.getfilesystemencoding())), os.pardir)) - -IMAGE_DIR = os.path.join(ROOT_DIR, "images") VERSION_DIR = os.path.join( HOME_DIR, "gramps%s%s" % (VERSION_TUPLE[0], VERSION_TUPLE[1])) @@ -168,15 +145,26 @@ USER_PLUGINS = os.path.join(VERSION_DIR, "plugins") USER_DIRLIST = (HOME_DIR, VERSION_DIR, ENV_DIR, TEMP_DIR, THUMB_DIR, THUMB_NORMAL, THUMB_LARGE, USER_PLUGINS) -ICON = os.path.join(ROOT_DIR, "images", "gramps.png") -LOGO = os.path.join(ROOT_DIR, "images", "logo.png") -SPLASH = os.path.join(ROOT_DIR, "images", "splash.jpg") -LICENSE_FILE = os.path.join(ROOT_DIR, "COPYING") +#------------------------------------------------------------------------- +# +# Paths to python modules - assumes that the root directory is one level +# above this one, and that the plugins directory is below the root directory. +# +#------------------------------------------------------------------------- +ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname( + __file__), os.pardir)) +if sys.version_info[0] < 3: + # test for sys.frozen to detect a py2exe executable on Windows + if hasattr(sys, "frozen"): + ROOT_DIR = os.path.abspath(os.path.dirname( + unicode(sys.executable, sys.getfilesystemencoding()))) + else: + ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname( + unicode(__file__, sys.getfilesystemencoding())), os.pardir)) # # Glade files # - GLADE_DIR = os.path.join(ROOT_DIR, "gui", "glade") GLADE_FILE = os.path.join(GLADE_DIR, "gramps.glade") PERSON_GLADE = os.path.join(GLADE_DIR, "edit_person.glade") @@ -186,22 +174,43 @@ RULE_GLADE = os.path.join(GLADE_DIR, "rule.glade") PLUGINS_DIR = os.path.join(ROOT_DIR, "plugins") -DATA_DIR = os.path.join(ROOT_DIR, "data") WEB_DIR = os.path.join(ROOT_DIR, 'webapp') -#SYSTEM_FILTERS = os.path.join(DATA_DIR, "system_filters.xml") -TIP_DATA = os.path.join(DATA_DIR, "tips.xml") WEBSTUFF_DIR = os.path.join(PLUGINS_DIR, "webstuff") WEBSTUFF_IMAGE_DIR = os.path.join(WEBSTUFF_DIR, "images") -PAPERSIZE = os.path.join(DATA_DIR, "papersize.xml") - -USE_TIPS = False +USE_TIPS = False if os.sys.platform in WINDOWS: USE_THUMBNAILER = False else: USE_THUMBNAILER = True +#------------------------------------------------------------------------- +# +# Paths to data files. +# +#------------------------------------------------------------------------- +SHARE_DIR = "@SHARE_DIR@" +LOCALE_DIR = "@LOCALE_DIR@" + +if SHARE_DIR != '': + DATA_DIR = os.path.join(SHARE_DIR, 'gramps') + IMAGE_DIR = os.path.join(SHARE_DIR, 'gramps', 'icons', 'hicolor') + DOC_DIR = os.path.join(SHARE_DIR, 'doc', 'gramps') +else: + DATA_DIR = 'data' + IMAGE_DIR = 'images' + DOC_DIR = os.curdir + +TIP_DATA = os.path.join(DATA_DIR, "tips.xml") +PAPERSIZE = os.path.join(DATA_DIR, "papersize.xml") + +ICON = os.path.join(IMAGE_DIR, "gramps.png") +LOGO = os.path.join(IMAGE_DIR, "logo.png") +SPLASH = os.path.join(IMAGE_DIR, "splash.jpg") + +LICENSE_FILE = os.path.join(DOC_DIR, 'COPYING') + #------------------------------------------------------------------------- # # About box information diff --git a/gramps/gen/svn_revision.py b/gramps/gen/svn_revision.py new file mode 100644 index 000000000..692b7bf40 --- /dev/null +++ b/gramps/gen/svn_revision.py @@ -0,0 +1,42 @@ +# +# Gramps - a GTK+/GNOME based genealogy program +# +# Copyright (C) 2012 Doug Blank +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +# $Id$ + +import sys +import subprocess + +if sys.version_info[0] < 3: + cuni = unicode +else: + def to_utf8(s): + return s.decode("utf-8") + cuni = to_utf8 + +def get_svn_revision(path=""): + stdout = "" + try: + p = subprocess.Popen("svnversion -n \"%s\"" % path, shell=True, + stdout=subprocess.PIPE, stderr=subprocess.PIPE) + (stdout, stderr) = p.communicate() + except: + pass + return "-r" + cuni(stdout) if stdout else "" + diff --git a/gramps/gen/utils/svn.py b/gramps/gen/utils/svn.py deleted file mode 100644 index d837da48f..000000000 --- a/gramps/gen/utils/svn.py +++ /dev/null @@ -1,67 +0,0 @@ -# -# Gramps - a GTK+/GNOME based genealogy program -# -# Copyright (C) 2012 Doug Blank -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# - -# $Id$ - -""" -Based on the version from Django, a Python ORM. -""" - -import re -import os - -from ..constfunc import cuni - -def get_svn_revision(path=None): - """ - Returns the SVN revision in the form SVN-XXXX, - where XXXX is the revision number. - - Returns "" if anything goes wrong, such as an unexpected - format of internal SVN files. - - If path is provided, it should be a directory whose SVN info you - want to inspect. If it's not provided, this will use the directory - where this file resides. - """ - rev = None - if path is None: - path = os.path.dirname(__file__) - entries_path = '%s/.svn/entries' % path - try: - entries = open(entries_path, 'r').read() - except IOError: - pass - else: - # Versions >= 7 of the entries file are flat text. The first line is - # the version number. The next set of digits after 'dir' is the revision - if re.match('(\d+)', entries): - rev_match = re.search('\d+\s+dir\s+(\d+)', entries) - if rev_match: - rev = rev_match.groups()[0] - # Older XML versions of the file specify revision as an attribute of - # the first entries node. - else: - from xml.dom import minidom - dom = minidom.parse(entries_path) - rev = dom.getElementsByTagName('entry')[0].getAttribute('revision') - if rev: - return cuni('SVN-%s' % rev) - return cuni('') diff --git a/gramps/images/16x16/geo-fixed-zoom.png b/images/16x16/geo-fixed-zoom.png similarity index 100% rename from gramps/images/16x16/geo-fixed-zoom.png rename to images/16x16/geo-fixed-zoom.png diff --git a/gramps/images/16x16/geo-free-zoom.png b/images/16x16/geo-free-zoom.png similarity index 100% rename from gramps/images/16x16/geo-free-zoom.png rename to images/16x16/geo-free-zoom.png diff --git a/gramps/images/16x16/geo-place-add.png b/images/16x16/geo-place-add.png similarity index 100% rename from gramps/images/16x16/geo-place-add.png rename to images/16x16/geo-place-add.png diff --git a/gramps/images/16x16/geo-place-link.png b/images/16x16/geo-place-link.png similarity index 100% rename from gramps/images/16x16/geo-place-link.png rename to images/16x16/geo-place-link.png diff --git a/gramps/images/16x16/geo-show-event.png b/images/16x16/geo-show-event.png similarity index 100% rename from gramps/images/16x16/geo-show-event.png rename to images/16x16/geo-show-event.png diff --git a/gramps/images/16x16/geo-show-family.png b/images/16x16/geo-show-family.png similarity index 100% rename from gramps/images/16x16/geo-show-family.png rename to images/16x16/geo-show-family.png diff --git a/gramps/images/16x16/geo-show-person.png b/images/16x16/geo-show-person.png similarity index 100% rename from gramps/images/16x16/geo-show-person.png rename to images/16x16/geo-show-person.png diff --git a/gramps/images/16x16/geo-show-place.png b/images/16x16/geo-show-place.png similarity index 100% rename from gramps/images/16x16/geo-show-place.png rename to images/16x16/geo-show-place.png diff --git a/gramps/images/16x16/gramps-address.png b/images/16x16/gramps-address.png similarity index 100% rename from gramps/images/16x16/gramps-address.png rename to images/16x16/gramps-address.png diff --git a/gramps/images/16x16/gramps-attribute.png b/images/16x16/gramps-attribute.png similarity index 100% rename from gramps/images/16x16/gramps-attribute.png rename to images/16x16/gramps-attribute.png diff --git a/gramps/images/16x16/gramps-bookmark-delete.png b/images/16x16/gramps-bookmark-delete.png similarity index 100% rename from gramps/images/16x16/gramps-bookmark-delete.png rename to images/16x16/gramps-bookmark-delete.png diff --git a/gramps/images/16x16/gramps-bookmark-edit.png b/images/16x16/gramps-bookmark-edit.png similarity index 100% rename from gramps/images/16x16/gramps-bookmark-edit.png rename to images/16x16/gramps-bookmark-edit.png diff --git a/gramps/images/16x16/gramps-bookmark-new.png b/images/16x16/gramps-bookmark-new.png similarity index 100% rename from gramps/images/16x16/gramps-bookmark-new.png rename to images/16x16/gramps-bookmark-new.png diff --git a/gramps/images/16x16/gramps-bookmark.png b/images/16x16/gramps-bookmark.png similarity index 100% rename from gramps/images/16x16/gramps-bookmark.png rename to images/16x16/gramps-bookmark.png diff --git a/gramps/images/16x16/gramps-citation.png b/images/16x16/gramps-citation.png similarity index 100% rename from gramps/images/16x16/gramps-citation.png rename to images/16x16/gramps-citation.png diff --git a/gramps/images/16x16/gramps-config.png b/images/16x16/gramps-config.png similarity index 100% rename from gramps/images/16x16/gramps-config.png rename to images/16x16/gramps-config.png diff --git a/gramps/images/16x16/gramps-date-edit.png b/images/16x16/gramps-date-edit.png similarity index 100% rename from gramps/images/16x16/gramps-date-edit.png rename to images/16x16/gramps-date-edit.png diff --git a/gramps/images/16x16/gramps-date.png b/images/16x16/gramps-date.png similarity index 100% rename from gramps/images/16x16/gramps-date.png rename to images/16x16/gramps-date.png diff --git a/gramps/images/16x16/gramps-event.png b/images/16x16/gramps-event.png similarity index 100% rename from gramps/images/16x16/gramps-event.png rename to images/16x16/gramps-event.png diff --git a/gramps/images/16x16/gramps-family.png b/images/16x16/gramps-family.png similarity index 100% rename from gramps/images/16x16/gramps-family.png rename to images/16x16/gramps-family.png diff --git a/gramps/images/16x16/gramps-fanchart.png b/images/16x16/gramps-fanchart.png similarity index 100% rename from gramps/images/16x16/gramps-fanchart.png rename to images/16x16/gramps-fanchart.png diff --git a/gramps/images/16x16/gramps-fanchartdesc.png b/images/16x16/gramps-fanchartdesc.png similarity index 100% rename from gramps/images/16x16/gramps-fanchartdesc.png rename to images/16x16/gramps-fanchartdesc.png diff --git a/gramps/images/16x16/gramps-font-bgcolor.png b/images/16x16/gramps-font-bgcolor.png similarity index 100% rename from gramps/images/16x16/gramps-font-bgcolor.png rename to images/16x16/gramps-font-bgcolor.png diff --git a/gramps/images/16x16/gramps-font-color.png b/images/16x16/gramps-font-color.png similarity index 100% rename from gramps/images/16x16/gramps-font-color.png rename to images/16x16/gramps-font-color.png diff --git a/gramps/images/16x16/gramps-font.png b/images/16x16/gramps-font.png similarity index 100% rename from gramps/images/16x16/gramps-font.png rename to images/16x16/gramps-font.png diff --git a/gramps/images/16x16/gramps-geo.png b/images/16x16/gramps-geo.png similarity index 100% rename from gramps/images/16x16/gramps-geo.png rename to images/16x16/gramps-geo.png diff --git a/gramps/images/16x16/gramps-gramplet.png b/images/16x16/gramps-gramplet.png similarity index 100% rename from gramps/images/16x16/gramps-gramplet.png rename to images/16x16/gramps-gramplet.png diff --git a/gramps/images/16x16/gramps-lock.png b/images/16x16/gramps-lock.png similarity index 100% rename from gramps/images/16x16/gramps-lock.png rename to images/16x16/gramps-lock.png diff --git a/gramps/images/16x16/gramps-media.png b/images/16x16/gramps-media.png similarity index 100% rename from gramps/images/16x16/gramps-media.png rename to images/16x16/gramps-media.png diff --git a/gramps/images/16x16/gramps-merge.png b/images/16x16/gramps-merge.png similarity index 100% rename from gramps/images/16x16/gramps-merge.png rename to images/16x16/gramps-merge.png diff --git a/gramps/images/16x16/gramps-notes.png b/images/16x16/gramps-notes.png similarity index 100% rename from gramps/images/16x16/gramps-notes.png rename to images/16x16/gramps-notes.png diff --git a/gramps/images/16x16/gramps-parents-add.png b/images/16x16/gramps-parents-add.png similarity index 100% rename from gramps/images/16x16/gramps-parents-add.png rename to images/16x16/gramps-parents-add.png diff --git a/gramps/images/16x16/gramps-parents-open.png b/images/16x16/gramps-parents-open.png similarity index 100% rename from gramps/images/16x16/gramps-parents-open.png rename to images/16x16/gramps-parents-open.png diff --git a/gramps/images/16x16/gramps-parents.png b/images/16x16/gramps-parents.png similarity index 100% rename from gramps/images/16x16/gramps-parents.png rename to images/16x16/gramps-parents.png diff --git a/gramps/images/16x16/gramps-pedigree.png b/images/16x16/gramps-pedigree.png similarity index 100% rename from gramps/images/16x16/gramps-pedigree.png rename to images/16x16/gramps-pedigree.png diff --git a/gramps/images/16x16/gramps-person.png b/images/16x16/gramps-person.png similarity index 100% rename from gramps/images/16x16/gramps-person.png rename to images/16x16/gramps-person.png diff --git a/gramps/images/16x16/gramps-place.png b/images/16x16/gramps-place.png similarity index 100% rename from gramps/images/16x16/gramps-place.png rename to images/16x16/gramps-place.png diff --git a/gramps/images/16x16/gramps-relation.png b/images/16x16/gramps-relation.png similarity index 100% rename from gramps/images/16x16/gramps-relation.png rename to images/16x16/gramps-relation.png diff --git a/gramps/images/16x16/gramps-reports.png b/images/16x16/gramps-reports.png similarity index 100% rename from gramps/images/16x16/gramps-reports.png rename to images/16x16/gramps-reports.png diff --git a/gramps/images/16x16/gramps-repository.png b/images/16x16/gramps-repository.png similarity index 100% rename from gramps/images/16x16/gramps-repository.png rename to images/16x16/gramps-repository.png diff --git a/gramps/images/16x16/gramps-source.png b/images/16x16/gramps-source.png similarity index 100% rename from gramps/images/16x16/gramps-source.png rename to images/16x16/gramps-source.png diff --git a/gramps/images/16x16/gramps-spouse.png b/images/16x16/gramps-spouse.png similarity index 100% rename from gramps/images/16x16/gramps-spouse.png rename to images/16x16/gramps-spouse.png diff --git a/gramps/images/16x16/gramps-tag-new.png b/images/16x16/gramps-tag-new.png similarity index 100% rename from gramps/images/16x16/gramps-tag-new.png rename to images/16x16/gramps-tag-new.png diff --git a/gramps/images/16x16/gramps-tag.png b/images/16x16/gramps-tag.png similarity index 100% rename from gramps/images/16x16/gramps-tag.png rename to images/16x16/gramps-tag.png diff --git a/gramps/images/16x16/gramps-tools.png b/images/16x16/gramps-tools.png similarity index 100% rename from gramps/images/16x16/gramps-tools.png rename to images/16x16/gramps-tools.png diff --git a/gramps/images/16x16/gramps-tree-group.png b/images/16x16/gramps-tree-group.png similarity index 100% rename from gramps/images/16x16/gramps-tree-group.png rename to images/16x16/gramps-tree-group.png diff --git a/gramps/images/16x16/gramps-tree-list.png b/images/16x16/gramps-tree-list.png similarity index 100% rename from gramps/images/16x16/gramps-tree-list.png rename to images/16x16/gramps-tree-list.png diff --git a/gramps/images/16x16/gramps-tree-select.png b/images/16x16/gramps-tree-select.png similarity index 100% rename from gramps/images/16x16/gramps-tree-select.png rename to images/16x16/gramps-tree-select.png diff --git a/gramps/images/16x16/gramps-unlock.png b/images/16x16/gramps-unlock.png similarity index 100% rename from gramps/images/16x16/gramps-unlock.png rename to images/16x16/gramps-unlock.png diff --git a/gramps/images/16x16/gramps-view.png b/images/16x16/gramps-view.png similarity index 100% rename from gramps/images/16x16/gramps-view.png rename to images/16x16/gramps-view.png diff --git a/gramps/images/16x16/gramps-viewmedia.png b/images/16x16/gramps-viewmedia.png similarity index 100% rename from gramps/images/16x16/gramps-viewmedia.png rename to images/16x16/gramps-viewmedia.png diff --git a/gramps/images/16x16/gramps-zoom-best-fit.png b/images/16x16/gramps-zoom-best-fit.png similarity index 100% rename from gramps/images/16x16/gramps-zoom-best-fit.png rename to images/16x16/gramps-zoom-best-fit.png diff --git a/gramps/images/16x16/gramps-zoom-fit-width.png b/images/16x16/gramps-zoom-fit-width.png similarity index 100% rename from gramps/images/16x16/gramps-zoom-fit-width.png rename to images/16x16/gramps-zoom-fit-width.png diff --git a/gramps/images/16x16/gramps-zoom-in.png b/images/16x16/gramps-zoom-in.png similarity index 100% rename from gramps/images/16x16/gramps-zoom-in.png rename to images/16x16/gramps-zoom-in.png diff --git a/gramps/images/16x16/gramps-zoom-out.png b/images/16x16/gramps-zoom-out.png similarity index 100% rename from gramps/images/16x16/gramps-zoom-out.png rename to images/16x16/gramps-zoom-out.png diff --git a/gramps/images/16x16/gramps.png b/images/16x16/gramps.png similarity index 100% rename from gramps/images/16x16/gramps.png rename to images/16x16/gramps.png diff --git a/gramps/images/16x16/source/gramps-geo.svg b/images/16x16/source/gramps-geo.svg similarity index 100% rename from gramps/images/16x16/source/gramps-geo.svg rename to images/16x16/source/gramps-geo.svg diff --git a/gramps/images/16x16/source/gramps-tree-group.svg b/images/16x16/source/gramps-tree-group.svg similarity index 100% rename from gramps/images/16x16/source/gramps-tree-group.svg rename to images/16x16/source/gramps-tree-group.svg diff --git a/gramps/images/16x16/source/gramps-tree-list.svg b/images/16x16/source/gramps-tree-list.svg similarity index 100% rename from gramps/images/16x16/source/gramps-tree-list.svg rename to images/16x16/source/gramps-tree-list.svg diff --git a/gramps/images/16x16/source/gramps-tree-select.svg b/images/16x16/source/gramps-tree-select.svg similarity index 100% rename from gramps/images/16x16/source/gramps-tree-select.svg rename to images/16x16/source/gramps-tree-select.svg diff --git a/gramps/images/22x22/geo-fixed-zoom.png b/images/22x22/geo-fixed-zoom.png similarity index 100% rename from gramps/images/22x22/geo-fixed-zoom.png rename to images/22x22/geo-fixed-zoom.png diff --git a/gramps/images/22x22/geo-free-zoom.png b/images/22x22/geo-free-zoom.png similarity index 100% rename from gramps/images/22x22/geo-free-zoom.png rename to images/22x22/geo-free-zoom.png diff --git a/gramps/images/22x22/geo-place-add.png b/images/22x22/geo-place-add.png similarity index 100% rename from gramps/images/22x22/geo-place-add.png rename to images/22x22/geo-place-add.png diff --git a/gramps/images/22x22/geo-place-link.png b/images/22x22/geo-place-link.png similarity index 100% rename from gramps/images/22x22/geo-place-link.png rename to images/22x22/geo-place-link.png diff --git a/gramps/images/22x22/geo-show-event.png b/images/22x22/geo-show-event.png similarity index 100% rename from gramps/images/22x22/geo-show-event.png rename to images/22x22/geo-show-event.png diff --git a/gramps/images/22x22/geo-show-family.png b/images/22x22/geo-show-family.png similarity index 100% rename from gramps/images/22x22/geo-show-family.png rename to images/22x22/geo-show-family.png diff --git a/gramps/images/22x22/geo-show-person.png b/images/22x22/geo-show-person.png similarity index 100% rename from gramps/images/22x22/geo-show-person.png rename to images/22x22/geo-show-person.png diff --git a/gramps/images/22x22/geo-show-place.png b/images/22x22/geo-show-place.png similarity index 100% rename from gramps/images/22x22/geo-show-place.png rename to images/22x22/geo-show-place.png diff --git a/gramps/images/22x22/gramps-address.png b/images/22x22/gramps-address.png similarity index 100% rename from gramps/images/22x22/gramps-address.png rename to images/22x22/gramps-address.png diff --git a/gramps/images/22x22/gramps-attribute.png b/images/22x22/gramps-attribute.png similarity index 100% rename from gramps/images/22x22/gramps-attribute.png rename to images/22x22/gramps-attribute.png diff --git a/gramps/images/22x22/gramps-bookmark-delete.png b/images/22x22/gramps-bookmark-delete.png similarity index 100% rename from gramps/images/22x22/gramps-bookmark-delete.png rename to images/22x22/gramps-bookmark-delete.png diff --git a/gramps/images/22x22/gramps-bookmark-edit.png b/images/22x22/gramps-bookmark-edit.png similarity index 100% rename from gramps/images/22x22/gramps-bookmark-edit.png rename to images/22x22/gramps-bookmark-edit.png diff --git a/gramps/images/22x22/gramps-bookmark-new.png b/images/22x22/gramps-bookmark-new.png similarity index 100% rename from gramps/images/22x22/gramps-bookmark-new.png rename to images/22x22/gramps-bookmark-new.png diff --git a/gramps/images/22x22/gramps-bookmark.png b/images/22x22/gramps-bookmark.png similarity index 100% rename from gramps/images/22x22/gramps-bookmark.png rename to images/22x22/gramps-bookmark.png diff --git a/gramps/images/22x22/gramps-citation.png b/images/22x22/gramps-citation.png similarity index 100% rename from gramps/images/22x22/gramps-citation.png rename to images/22x22/gramps-citation.png diff --git a/gramps/images/22x22/gramps-config.png b/images/22x22/gramps-config.png similarity index 100% rename from gramps/images/22x22/gramps-config.png rename to images/22x22/gramps-config.png diff --git a/gramps/images/22x22/gramps-date-edit.png b/images/22x22/gramps-date-edit.png similarity index 100% rename from gramps/images/22x22/gramps-date-edit.png rename to images/22x22/gramps-date-edit.png diff --git a/gramps/images/22x22/gramps-date.png b/images/22x22/gramps-date.png similarity index 100% rename from gramps/images/22x22/gramps-date.png rename to images/22x22/gramps-date.png diff --git a/gramps/images/22x22/gramps-event.png b/images/22x22/gramps-event.png similarity index 100% rename from gramps/images/22x22/gramps-event.png rename to images/22x22/gramps-event.png diff --git a/gramps/images/22x22/gramps-family.png b/images/22x22/gramps-family.png similarity index 100% rename from gramps/images/22x22/gramps-family.png rename to images/22x22/gramps-family.png diff --git a/gramps/images/22x22/gramps-fanchart.png b/images/22x22/gramps-fanchart.png similarity index 100% rename from gramps/images/22x22/gramps-fanchart.png rename to images/22x22/gramps-fanchart.png diff --git a/gramps/images/22x22/gramps-fanchartdesc.png b/images/22x22/gramps-fanchartdesc.png similarity index 100% rename from gramps/images/22x22/gramps-fanchartdesc.png rename to images/22x22/gramps-fanchartdesc.png diff --git a/gramps/images/22x22/gramps-font-bgcolor.png b/images/22x22/gramps-font-bgcolor.png similarity index 100% rename from gramps/images/22x22/gramps-font-bgcolor.png rename to images/22x22/gramps-font-bgcolor.png diff --git a/gramps/images/22x22/gramps-font-color.png b/images/22x22/gramps-font-color.png similarity index 100% rename from gramps/images/22x22/gramps-font-color.png rename to images/22x22/gramps-font-color.png diff --git a/gramps/images/22x22/gramps-font.png b/images/22x22/gramps-font.png similarity index 100% rename from gramps/images/22x22/gramps-font.png rename to images/22x22/gramps-font.png diff --git a/gramps/images/22x22/gramps-geo-altmap.png b/images/22x22/gramps-geo-altmap.png similarity index 100% rename from gramps/images/22x22/gramps-geo-altmap.png rename to images/22x22/gramps-geo-altmap.png diff --git a/gramps/images/22x22/gramps-geo-birth.png b/images/22x22/gramps-geo-birth.png similarity index 100% rename from gramps/images/22x22/gramps-geo-birth.png rename to images/22x22/gramps-geo-birth.png diff --git a/gramps/images/22x22/gramps-geo-death.png b/images/22x22/gramps-geo-death.png similarity index 100% rename from gramps/images/22x22/gramps-geo-death.png rename to images/22x22/gramps-geo-death.png diff --git a/gramps/images/22x22/gramps-geo-mainmap.png b/images/22x22/gramps-geo-mainmap.png similarity index 100% rename from gramps/images/22x22/gramps-geo-mainmap.png rename to images/22x22/gramps-geo-mainmap.png diff --git a/gramps/images/22x22/gramps-geo-marriage.png b/images/22x22/gramps-geo-marriage.png similarity index 100% rename from gramps/images/22x22/gramps-geo-marriage.png rename to images/22x22/gramps-geo-marriage.png diff --git a/gramps/images/22x22/gramps-geo.png b/images/22x22/gramps-geo.png similarity index 100% rename from gramps/images/22x22/gramps-geo.png rename to images/22x22/gramps-geo.png diff --git a/gramps/images/22x22/gramps-gramplet.png b/images/22x22/gramps-gramplet.png similarity index 100% rename from gramps/images/22x22/gramps-gramplet.png rename to images/22x22/gramps-gramplet.png diff --git a/gramps/images/22x22/gramps-lock.png b/images/22x22/gramps-lock.png similarity index 100% rename from gramps/images/22x22/gramps-lock.png rename to images/22x22/gramps-lock.png diff --git a/gramps/images/22x22/gramps-media.png b/images/22x22/gramps-media.png similarity index 100% rename from gramps/images/22x22/gramps-media.png rename to images/22x22/gramps-media.png diff --git a/gramps/images/22x22/gramps-merge.png b/images/22x22/gramps-merge.png similarity index 100% rename from gramps/images/22x22/gramps-merge.png rename to images/22x22/gramps-merge.png diff --git a/gramps/images/22x22/gramps-notes.png b/images/22x22/gramps-notes.png similarity index 100% rename from gramps/images/22x22/gramps-notes.png rename to images/22x22/gramps-notes.png diff --git a/gramps/images/22x22/gramps-parents-add.png b/images/22x22/gramps-parents-add.png similarity index 100% rename from gramps/images/22x22/gramps-parents-add.png rename to images/22x22/gramps-parents-add.png diff --git a/gramps/images/22x22/gramps-parents-open.png b/images/22x22/gramps-parents-open.png similarity index 100% rename from gramps/images/22x22/gramps-parents-open.png rename to images/22x22/gramps-parents-open.png diff --git a/gramps/images/22x22/gramps-parents.png b/images/22x22/gramps-parents.png similarity index 100% rename from gramps/images/22x22/gramps-parents.png rename to images/22x22/gramps-parents.png diff --git a/gramps/images/22x22/gramps-pedigree.png b/images/22x22/gramps-pedigree.png similarity index 100% rename from gramps/images/22x22/gramps-pedigree.png rename to images/22x22/gramps-pedigree.png diff --git a/gramps/images/22x22/gramps-person.png b/images/22x22/gramps-person.png similarity index 100% rename from gramps/images/22x22/gramps-person.png rename to images/22x22/gramps-person.png diff --git a/gramps/images/22x22/gramps-place.png b/images/22x22/gramps-place.png similarity index 100% rename from gramps/images/22x22/gramps-place.png rename to images/22x22/gramps-place.png diff --git a/gramps/images/22x22/gramps-relation.png b/images/22x22/gramps-relation.png similarity index 100% rename from gramps/images/22x22/gramps-relation.png rename to images/22x22/gramps-relation.png diff --git a/gramps/images/22x22/gramps-reports.png b/images/22x22/gramps-reports.png similarity index 100% rename from gramps/images/22x22/gramps-reports.png rename to images/22x22/gramps-reports.png diff --git a/gramps/images/22x22/gramps-repository.png b/images/22x22/gramps-repository.png similarity index 100% rename from gramps/images/22x22/gramps-repository.png rename to images/22x22/gramps-repository.png diff --git a/gramps/images/22x22/gramps-source.png b/images/22x22/gramps-source.png similarity index 100% rename from gramps/images/22x22/gramps-source.png rename to images/22x22/gramps-source.png diff --git a/gramps/images/22x22/gramps-spouse.png b/images/22x22/gramps-spouse.png similarity index 100% rename from gramps/images/22x22/gramps-spouse.png rename to images/22x22/gramps-spouse.png diff --git a/gramps/images/22x22/gramps-tag-new.png b/images/22x22/gramps-tag-new.png similarity index 100% rename from gramps/images/22x22/gramps-tag-new.png rename to images/22x22/gramps-tag-new.png diff --git a/gramps/images/22x22/gramps-tag.png b/images/22x22/gramps-tag.png similarity index 100% rename from gramps/images/22x22/gramps-tag.png rename to images/22x22/gramps-tag.png diff --git a/gramps/images/22x22/gramps-tools.png b/images/22x22/gramps-tools.png similarity index 100% rename from gramps/images/22x22/gramps-tools.png rename to images/22x22/gramps-tools.png diff --git a/gramps/images/22x22/gramps-tree-group.png b/images/22x22/gramps-tree-group.png similarity index 100% rename from gramps/images/22x22/gramps-tree-group.png rename to images/22x22/gramps-tree-group.png diff --git a/gramps/images/22x22/gramps-tree-list.png b/images/22x22/gramps-tree-list.png similarity index 100% rename from gramps/images/22x22/gramps-tree-list.png rename to images/22x22/gramps-tree-list.png diff --git a/gramps/images/22x22/gramps-tree-select.png b/images/22x22/gramps-tree-select.png similarity index 100% rename from gramps/images/22x22/gramps-tree-select.png rename to images/22x22/gramps-tree-select.png diff --git a/gramps/images/22x22/gramps-unlock.png b/images/22x22/gramps-unlock.png similarity index 100% rename from gramps/images/22x22/gramps-unlock.png rename to images/22x22/gramps-unlock.png diff --git a/gramps/images/22x22/gramps-view.png b/images/22x22/gramps-view.png similarity index 100% rename from gramps/images/22x22/gramps-view.png rename to images/22x22/gramps-view.png diff --git a/gramps/images/22x22/gramps-viewmedia.png b/images/22x22/gramps-viewmedia.png similarity index 100% rename from gramps/images/22x22/gramps-viewmedia.png rename to images/22x22/gramps-viewmedia.png diff --git a/gramps/images/22x22/gramps-zoom-best-fit.png b/images/22x22/gramps-zoom-best-fit.png similarity index 100% rename from gramps/images/22x22/gramps-zoom-best-fit.png rename to images/22x22/gramps-zoom-best-fit.png diff --git a/gramps/images/22x22/gramps-zoom-fit-width.png b/images/22x22/gramps-zoom-fit-width.png similarity index 100% rename from gramps/images/22x22/gramps-zoom-fit-width.png rename to images/22x22/gramps-zoom-fit-width.png diff --git a/gramps/images/22x22/gramps-zoom-in.png b/images/22x22/gramps-zoom-in.png similarity index 100% rename from gramps/images/22x22/gramps-zoom-in.png rename to images/22x22/gramps-zoom-in.png diff --git a/gramps/images/22x22/gramps-zoom-out.png b/images/22x22/gramps-zoom-out.png similarity index 100% rename from gramps/images/22x22/gramps-zoom-out.png rename to images/22x22/gramps-zoom-out.png diff --git a/gramps/images/22x22/gramps.png b/images/22x22/gramps.png similarity index 100% rename from gramps/images/22x22/gramps.png rename to images/22x22/gramps.png diff --git a/gramps/images/48x48/geo-fixed-zoom.png b/images/48x48/geo-fixed-zoom.png similarity index 100% rename from gramps/images/48x48/geo-fixed-zoom.png rename to images/48x48/geo-fixed-zoom.png diff --git a/gramps/images/48x48/geo-free-zoom.png b/images/48x48/geo-free-zoom.png similarity index 100% rename from gramps/images/48x48/geo-free-zoom.png rename to images/48x48/geo-free-zoom.png diff --git a/gramps/images/48x48/geo-place-add.png b/images/48x48/geo-place-add.png similarity index 100% rename from gramps/images/48x48/geo-place-add.png rename to images/48x48/geo-place-add.png diff --git a/gramps/images/48x48/geo-place-link.png b/images/48x48/geo-place-link.png similarity index 100% rename from gramps/images/48x48/geo-place-link.png rename to images/48x48/geo-place-link.png diff --git a/gramps/images/48x48/geo-show-event.png b/images/48x48/geo-show-event.png similarity index 100% rename from gramps/images/48x48/geo-show-event.png rename to images/48x48/geo-show-event.png diff --git a/gramps/images/48x48/geo-show-family.png b/images/48x48/geo-show-family.png similarity index 100% rename from gramps/images/48x48/geo-show-family.png rename to images/48x48/geo-show-family.png diff --git a/gramps/images/48x48/geo-show-person.png b/images/48x48/geo-show-person.png similarity index 100% rename from gramps/images/48x48/geo-show-person.png rename to images/48x48/geo-show-person.png diff --git a/gramps/images/48x48/geo-show-place.png b/images/48x48/geo-show-place.png similarity index 100% rename from gramps/images/48x48/geo-show-place.png rename to images/48x48/geo-show-place.png diff --git a/gramps/images/48x48/gramps-address.png b/images/48x48/gramps-address.png similarity index 100% rename from gramps/images/48x48/gramps-address.png rename to images/48x48/gramps-address.png diff --git a/gramps/images/48x48/gramps-attribute.png b/images/48x48/gramps-attribute.png similarity index 100% rename from gramps/images/48x48/gramps-attribute.png rename to images/48x48/gramps-attribute.png diff --git a/gramps/images/48x48/gramps-bookmark-delete.png b/images/48x48/gramps-bookmark-delete.png similarity index 100% rename from gramps/images/48x48/gramps-bookmark-delete.png rename to images/48x48/gramps-bookmark-delete.png diff --git a/gramps/images/48x48/gramps-bookmark-edit.png b/images/48x48/gramps-bookmark-edit.png similarity index 100% rename from gramps/images/48x48/gramps-bookmark-edit.png rename to images/48x48/gramps-bookmark-edit.png diff --git a/gramps/images/48x48/gramps-bookmark-new.png b/images/48x48/gramps-bookmark-new.png similarity index 100% rename from gramps/images/48x48/gramps-bookmark-new.png rename to images/48x48/gramps-bookmark-new.png diff --git a/gramps/images/48x48/gramps-bookmark.png b/images/48x48/gramps-bookmark.png similarity index 100% rename from gramps/images/48x48/gramps-bookmark.png rename to images/48x48/gramps-bookmark.png diff --git a/gramps/images/48x48/gramps-citation.png b/images/48x48/gramps-citation.png similarity index 100% rename from gramps/images/48x48/gramps-citation.png rename to images/48x48/gramps-citation.png diff --git a/gramps/images/48x48/gramps-config.png b/images/48x48/gramps-config.png similarity index 100% rename from gramps/images/48x48/gramps-config.png rename to images/48x48/gramps-config.png diff --git a/gramps/images/48x48/gramps-date-edit.png b/images/48x48/gramps-date-edit.png similarity index 100% rename from gramps/images/48x48/gramps-date-edit.png rename to images/48x48/gramps-date-edit.png diff --git a/gramps/images/48x48/gramps-date.png b/images/48x48/gramps-date.png similarity index 100% rename from gramps/images/48x48/gramps-date.png rename to images/48x48/gramps-date.png diff --git a/gramps/images/48x48/gramps-event.png b/images/48x48/gramps-event.png similarity index 100% rename from gramps/images/48x48/gramps-event.png rename to images/48x48/gramps-event.png diff --git a/gramps/images/48x48/gramps-family.png b/images/48x48/gramps-family.png similarity index 100% rename from gramps/images/48x48/gramps-family.png rename to images/48x48/gramps-family.png diff --git a/gramps/images/48x48/gramps-fanchart.png b/images/48x48/gramps-fanchart.png similarity index 100% rename from gramps/images/48x48/gramps-fanchart.png rename to images/48x48/gramps-fanchart.png diff --git a/gramps/images/48x48/gramps-fanchartdesc.png b/images/48x48/gramps-fanchartdesc.png similarity index 100% rename from gramps/images/48x48/gramps-fanchartdesc.png rename to images/48x48/gramps-fanchartdesc.png diff --git a/gramps/images/48x48/gramps-font-bgcolor.png b/images/48x48/gramps-font-bgcolor.png similarity index 100% rename from gramps/images/48x48/gramps-font-bgcolor.png rename to images/48x48/gramps-font-bgcolor.png diff --git a/gramps/images/48x48/gramps-font-color.png b/images/48x48/gramps-font-color.png similarity index 100% rename from gramps/images/48x48/gramps-font-color.png rename to images/48x48/gramps-font-color.png diff --git a/gramps/images/48x48/gramps-font.png b/images/48x48/gramps-font.png similarity index 100% rename from gramps/images/48x48/gramps-font.png rename to images/48x48/gramps-font.png diff --git a/gramps/images/48x48/gramps-geo-altmap.png b/images/48x48/gramps-geo-altmap.png similarity index 100% rename from gramps/images/48x48/gramps-geo-altmap.png rename to images/48x48/gramps-geo-altmap.png diff --git a/gramps/images/48x48/gramps-geo-birth.png b/images/48x48/gramps-geo-birth.png similarity index 100% rename from gramps/images/48x48/gramps-geo-birth.png rename to images/48x48/gramps-geo-birth.png diff --git a/gramps/images/48x48/gramps-geo-death.png b/images/48x48/gramps-geo-death.png similarity index 100% rename from gramps/images/48x48/gramps-geo-death.png rename to images/48x48/gramps-geo-death.png diff --git a/gramps/images/48x48/gramps-geo-mainmap.png b/images/48x48/gramps-geo-mainmap.png similarity index 100% rename from gramps/images/48x48/gramps-geo-mainmap.png rename to images/48x48/gramps-geo-mainmap.png diff --git a/gramps/images/48x48/gramps-geo-marriage.png b/images/48x48/gramps-geo-marriage.png similarity index 100% rename from gramps/images/48x48/gramps-geo-marriage.png rename to images/48x48/gramps-geo-marriage.png diff --git a/gramps/images/48x48/gramps-geo.png b/images/48x48/gramps-geo.png similarity index 100% rename from gramps/images/48x48/gramps-geo.png rename to images/48x48/gramps-geo.png diff --git a/gramps/images/48x48/gramps-gramplet.png b/images/48x48/gramps-gramplet.png similarity index 100% rename from gramps/images/48x48/gramps-gramplet.png rename to images/48x48/gramps-gramplet.png diff --git a/gramps/images/48x48/gramps-lock.png b/images/48x48/gramps-lock.png similarity index 100% rename from gramps/images/48x48/gramps-lock.png rename to images/48x48/gramps-lock.png diff --git a/gramps/images/48x48/gramps-media.png b/images/48x48/gramps-media.png similarity index 100% rename from gramps/images/48x48/gramps-media.png rename to images/48x48/gramps-media.png diff --git a/gramps/images/48x48/gramps-merge.png b/images/48x48/gramps-merge.png similarity index 100% rename from gramps/images/48x48/gramps-merge.png rename to images/48x48/gramps-merge.png diff --git a/gramps/images/48x48/gramps-notes.png b/images/48x48/gramps-notes.png similarity index 100% rename from gramps/images/48x48/gramps-notes.png rename to images/48x48/gramps-notes.png diff --git a/gramps/images/48x48/gramps-parents-add.png b/images/48x48/gramps-parents-add.png similarity index 100% rename from gramps/images/48x48/gramps-parents-add.png rename to images/48x48/gramps-parents-add.png diff --git a/gramps/images/48x48/gramps-parents-open.png b/images/48x48/gramps-parents-open.png similarity index 100% rename from gramps/images/48x48/gramps-parents-open.png rename to images/48x48/gramps-parents-open.png diff --git a/gramps/images/48x48/gramps-parents.png b/images/48x48/gramps-parents.png similarity index 100% rename from gramps/images/48x48/gramps-parents.png rename to images/48x48/gramps-parents.png diff --git a/gramps/images/48x48/gramps-pedigree.png b/images/48x48/gramps-pedigree.png similarity index 100% rename from gramps/images/48x48/gramps-pedigree.png rename to images/48x48/gramps-pedigree.png diff --git a/gramps/images/48x48/gramps-person.png b/images/48x48/gramps-person.png similarity index 100% rename from gramps/images/48x48/gramps-person.png rename to images/48x48/gramps-person.png diff --git a/gramps/images/48x48/gramps-place.png b/images/48x48/gramps-place.png similarity index 100% rename from gramps/images/48x48/gramps-place.png rename to images/48x48/gramps-place.png diff --git a/gramps/images/48x48/gramps-relation.png b/images/48x48/gramps-relation.png similarity index 100% rename from gramps/images/48x48/gramps-relation.png rename to images/48x48/gramps-relation.png diff --git a/gramps/images/48x48/gramps-reports.png b/images/48x48/gramps-reports.png similarity index 100% rename from gramps/images/48x48/gramps-reports.png rename to images/48x48/gramps-reports.png diff --git a/gramps/images/48x48/gramps-repository.png b/images/48x48/gramps-repository.png similarity index 100% rename from gramps/images/48x48/gramps-repository.png rename to images/48x48/gramps-repository.png diff --git a/gramps/images/48x48/gramps-source.png b/images/48x48/gramps-source.png similarity index 100% rename from gramps/images/48x48/gramps-source.png rename to images/48x48/gramps-source.png diff --git a/gramps/images/48x48/gramps-spouse.png b/images/48x48/gramps-spouse.png similarity index 100% rename from gramps/images/48x48/gramps-spouse.png rename to images/48x48/gramps-spouse.png diff --git a/gramps/images/48x48/gramps-tag-new.png b/images/48x48/gramps-tag-new.png similarity index 100% rename from gramps/images/48x48/gramps-tag-new.png rename to images/48x48/gramps-tag-new.png diff --git a/gramps/images/48x48/gramps-tag.png b/images/48x48/gramps-tag.png similarity index 100% rename from gramps/images/48x48/gramps-tag.png rename to images/48x48/gramps-tag.png diff --git a/gramps/images/48x48/gramps-tools.png b/images/48x48/gramps-tools.png similarity index 100% rename from gramps/images/48x48/gramps-tools.png rename to images/48x48/gramps-tools.png diff --git a/gramps/images/48x48/gramps-tree-group.png b/images/48x48/gramps-tree-group.png similarity index 100% rename from gramps/images/48x48/gramps-tree-group.png rename to images/48x48/gramps-tree-group.png diff --git a/gramps/images/48x48/gramps-tree-list.png b/images/48x48/gramps-tree-list.png similarity index 100% rename from gramps/images/48x48/gramps-tree-list.png rename to images/48x48/gramps-tree-list.png diff --git a/gramps/images/48x48/gramps-tree-select.png b/images/48x48/gramps-tree-select.png similarity index 100% rename from gramps/images/48x48/gramps-tree-select.png rename to images/48x48/gramps-tree-select.png diff --git a/gramps/images/48x48/gramps-unlock.png b/images/48x48/gramps-unlock.png similarity index 100% rename from gramps/images/48x48/gramps-unlock.png rename to images/48x48/gramps-unlock.png diff --git a/gramps/images/48x48/gramps-view.png b/images/48x48/gramps-view.png similarity index 100% rename from gramps/images/48x48/gramps-view.png rename to images/48x48/gramps-view.png diff --git a/gramps/images/48x48/gramps-viewmedia.png b/images/48x48/gramps-viewmedia.png similarity index 100% rename from gramps/images/48x48/gramps-viewmedia.png rename to images/48x48/gramps-viewmedia.png diff --git a/gramps/images/48x48/gramps-zoom-best-fit.png b/images/48x48/gramps-zoom-best-fit.png similarity index 100% rename from gramps/images/48x48/gramps-zoom-best-fit.png rename to images/48x48/gramps-zoom-best-fit.png diff --git a/gramps/images/48x48/gramps-zoom-fit-width.png b/images/48x48/gramps-zoom-fit-width.png similarity index 100% rename from gramps/images/48x48/gramps-zoom-fit-width.png rename to images/48x48/gramps-zoom-fit-width.png diff --git a/gramps/images/48x48/gramps-zoom-in.png b/images/48x48/gramps-zoom-in.png similarity index 100% rename from gramps/images/48x48/gramps-zoom-in.png rename to images/48x48/gramps-zoom-in.png diff --git a/gramps/images/48x48/gramps-zoom-out.png b/images/48x48/gramps-zoom-out.png similarity index 100% rename from gramps/images/48x48/gramps-zoom-out.png rename to images/48x48/gramps-zoom-out.png diff --git a/gramps/images/48x48/gramps.png b/images/48x48/gramps.png similarity index 100% rename from gramps/images/48x48/gramps.png rename to images/48x48/gramps.png diff --git a/gramps/images/add.png b/images/add.png similarity index 100% rename from gramps/images/add.png rename to images/add.png diff --git a/gramps/images/bad.png b/images/bad.png similarity index 100% rename from gramps/images/bad.png rename to images/bad.png diff --git a/gramps/images/caution.png b/images/caution.png similarity index 100% rename from gramps/images/caution.png rename to images/caution.png diff --git a/gramps/images/document.png b/images/document.png similarity index 100% rename from gramps/images/document.png rename to images/document.png diff --git a/gramps/images/down.png b/images/down.png similarity index 100% rename from gramps/images/down.png rename to images/down.png diff --git a/gramps/images/good.png b/images/good.png similarity index 100% rename from gramps/images/good.png rename to images/good.png diff --git a/gramps/images/gramps-export.png b/images/gramps-export.png similarity index 100% rename from gramps/images/gramps-export.png rename to images/gramps-export.png diff --git a/gramps/images/gramps-import.png b/images/gramps-import.png similarity index 100% rename from gramps/images/gramps-import.png rename to images/gramps-import.png diff --git a/gramps/images/gramps-undo-history.png b/images/gramps-undo-history.png similarity index 100% rename from gramps/images/gramps-undo-history.png rename to images/gramps-undo-history.png diff --git a/gramps/images/gramps-url.png b/images/gramps-url.png similarity index 100% rename from gramps/images/gramps-url.png rename to images/gramps-url.png diff --git a/gramps/images/gramps.png b/images/gramps.png similarity index 100% rename from gramps/images/gramps.png rename to images/gramps.png diff --git a/gramps/images/gramps.svg b/images/gramps.svg similarity index 100% rename from gramps/images/gramps.svg rename to images/gramps.svg diff --git a/gramps/images/gtk-remove.png b/images/gtk-remove.png similarity index 100% rename from gramps/images/gtk-remove.png rename to images/gtk-remove.png diff --git a/gramps/images/image-missing.png b/images/image-missing.png similarity index 100% rename from gramps/images/image-missing.png rename to images/image-missing.png diff --git a/gramps/images/logo.png b/images/logo.png similarity index 100% rename from gramps/images/logo.png rename to images/logo.png diff --git a/gramps/images/next.png b/images/next.png similarity index 100% rename from gramps/images/next.png rename to images/next.png diff --git a/gramps/images/ped24.ico b/images/ped24.ico similarity index 100% rename from gramps/images/ped24.ico rename to images/ped24.ico diff --git a/gramps/images/previous.png b/images/previous.png similarity index 100% rename from gramps/images/previous.png rename to images/previous.png diff --git a/gramps/images/scalable/add-parent-existing-family.svg b/images/scalable/add-parent-existing-family.svg similarity index 100% rename from gramps/images/scalable/add-parent-existing-family.svg rename to images/scalable/add-parent-existing-family.svg diff --git a/gramps/images/scalable/geo-fixed-zoom.svg b/images/scalable/geo-fixed-zoom.svg similarity index 100% rename from gramps/images/scalable/geo-fixed-zoom.svg rename to images/scalable/geo-fixed-zoom.svg diff --git a/gramps/images/scalable/geo-free-zoom.svg b/images/scalable/geo-free-zoom.svg similarity index 100% rename from gramps/images/scalable/geo-free-zoom.svg rename to images/scalable/geo-free-zoom.svg diff --git a/gramps/images/scalable/geo-place-add.svg b/images/scalable/geo-place-add.svg similarity index 100% rename from gramps/images/scalable/geo-place-add.svg rename to images/scalable/geo-place-add.svg diff --git a/gramps/images/scalable/geo-place-link.svg b/images/scalable/geo-place-link.svg similarity index 100% rename from gramps/images/scalable/geo-place-link.svg rename to images/scalable/geo-place-link.svg diff --git a/gramps/images/scalable/geo-show-event.svg b/images/scalable/geo-show-event.svg similarity index 100% rename from gramps/images/scalable/geo-show-event.svg rename to images/scalable/geo-show-event.svg diff --git a/gramps/images/scalable/geo-show-family.svg b/images/scalable/geo-show-family.svg similarity index 100% rename from gramps/images/scalable/geo-show-family.svg rename to images/scalable/geo-show-family.svg diff --git a/gramps/images/scalable/geo-show-person.svg b/images/scalable/geo-show-person.svg similarity index 100% rename from gramps/images/scalable/geo-show-person.svg rename to images/scalable/geo-show-person.svg diff --git a/gramps/images/scalable/geo-show-place.svg b/images/scalable/geo-show-place.svg similarity index 100% rename from gramps/images/scalable/geo-show-place.svg rename to images/scalable/geo-show-place.svg diff --git a/gramps/images/scalable/gramps-address.svg b/images/scalable/gramps-address.svg similarity index 100% rename from gramps/images/scalable/gramps-address.svg rename to images/scalable/gramps-address.svg diff --git a/gramps/images/scalable/gramps-attribute.svg b/images/scalable/gramps-attribute.svg similarity index 100% rename from gramps/images/scalable/gramps-attribute.svg rename to images/scalable/gramps-attribute.svg diff --git a/gramps/images/scalable/gramps-bookmark-delete.svg b/images/scalable/gramps-bookmark-delete.svg similarity index 100% rename from gramps/images/scalable/gramps-bookmark-delete.svg rename to images/scalable/gramps-bookmark-delete.svg diff --git a/gramps/images/scalable/gramps-bookmark-edit.svg b/images/scalable/gramps-bookmark-edit.svg similarity index 100% rename from gramps/images/scalable/gramps-bookmark-edit.svg rename to images/scalable/gramps-bookmark-edit.svg diff --git a/gramps/images/scalable/gramps-bookmark-new.svg b/images/scalable/gramps-bookmark-new.svg similarity index 100% rename from gramps/images/scalable/gramps-bookmark-new.svg rename to images/scalable/gramps-bookmark-new.svg diff --git a/gramps/images/scalable/gramps-bookmark.svg b/images/scalable/gramps-bookmark.svg similarity index 100% rename from gramps/images/scalable/gramps-bookmark.svg rename to images/scalable/gramps-bookmark.svg diff --git a/gramps/images/scalable/gramps-citation.svg b/images/scalable/gramps-citation.svg similarity index 100% rename from gramps/images/scalable/gramps-citation.svg rename to images/scalable/gramps-citation.svg diff --git a/gramps/images/scalable/gramps-config.svg b/images/scalable/gramps-config.svg similarity index 100% rename from gramps/images/scalable/gramps-config.svg rename to images/scalable/gramps-config.svg diff --git a/gramps/images/scalable/gramps-date-edit.svg b/images/scalable/gramps-date-edit.svg similarity index 100% rename from gramps/images/scalable/gramps-date-edit.svg rename to images/scalable/gramps-date-edit.svg diff --git a/gramps/images/scalable/gramps-date.svg b/images/scalable/gramps-date.svg similarity index 100% rename from gramps/images/scalable/gramps-date.svg rename to images/scalable/gramps-date.svg diff --git a/gramps/images/scalable/gramps-event.svg b/images/scalable/gramps-event.svg similarity index 100% rename from gramps/images/scalable/gramps-event.svg rename to images/scalable/gramps-event.svg diff --git a/gramps/images/scalable/gramps-family.svg b/images/scalable/gramps-family.svg similarity index 100% rename from gramps/images/scalable/gramps-family.svg rename to images/scalable/gramps-family.svg diff --git a/gramps/images/scalable/gramps-fanchart.svg b/images/scalable/gramps-fanchart.svg similarity index 100% rename from gramps/images/scalable/gramps-fanchart.svg rename to images/scalable/gramps-fanchart.svg diff --git a/gramps/images/scalable/gramps-fanchartdesc.svg b/images/scalable/gramps-fanchartdesc.svg similarity index 100% rename from gramps/images/scalable/gramps-fanchartdesc.svg rename to images/scalable/gramps-fanchartdesc.svg diff --git a/gramps/images/scalable/gramps-font-bgcolor.svg b/images/scalable/gramps-font-bgcolor.svg similarity index 100% rename from gramps/images/scalable/gramps-font-bgcolor.svg rename to images/scalable/gramps-font-bgcolor.svg diff --git a/gramps/images/scalable/gramps-font-color.svg b/images/scalable/gramps-font-color.svg similarity index 100% rename from gramps/images/scalable/gramps-font-color.svg rename to images/scalable/gramps-font-color.svg diff --git a/gramps/images/scalable/gramps-font.svg b/images/scalable/gramps-font.svg similarity index 100% rename from gramps/images/scalable/gramps-font.svg rename to images/scalable/gramps-font.svg diff --git a/gramps/images/scalable/gramps-geo-altmap.svg b/images/scalable/gramps-geo-altmap.svg similarity index 100% rename from gramps/images/scalable/gramps-geo-altmap.svg rename to images/scalable/gramps-geo-altmap.svg diff --git a/gramps/images/scalable/gramps-geo-birth.svg b/images/scalable/gramps-geo-birth.svg similarity index 100% rename from gramps/images/scalable/gramps-geo-birth.svg rename to images/scalable/gramps-geo-birth.svg diff --git a/gramps/images/scalable/gramps-geo-death.svg b/images/scalable/gramps-geo-death.svg similarity index 100% rename from gramps/images/scalable/gramps-geo-death.svg rename to images/scalable/gramps-geo-death.svg diff --git a/gramps/images/scalable/gramps-geo-mainmap.svg b/images/scalable/gramps-geo-mainmap.svg similarity index 100% rename from gramps/images/scalable/gramps-geo-mainmap.svg rename to images/scalable/gramps-geo-mainmap.svg diff --git a/gramps/images/scalable/gramps-geo-marriage.svg b/images/scalable/gramps-geo-marriage.svg similarity index 100% rename from gramps/images/scalable/gramps-geo-marriage.svg rename to images/scalable/gramps-geo-marriage.svg diff --git a/gramps/images/scalable/gramps-geo.svg b/images/scalable/gramps-geo.svg similarity index 100% rename from gramps/images/scalable/gramps-geo.svg rename to images/scalable/gramps-geo.svg diff --git a/gramps/images/scalable/gramps-gramplet.svg b/images/scalable/gramps-gramplet.svg similarity index 100% rename from gramps/images/scalable/gramps-gramplet.svg rename to images/scalable/gramps-gramplet.svg diff --git a/gramps/images/scalable/gramps-lock.svg b/images/scalable/gramps-lock.svg similarity index 100% rename from gramps/images/scalable/gramps-lock.svg rename to images/scalable/gramps-lock.svg diff --git a/gramps/images/scalable/gramps-media.svg b/images/scalable/gramps-media.svg similarity index 100% rename from gramps/images/scalable/gramps-media.svg rename to images/scalable/gramps-media.svg diff --git a/gramps/images/scalable/gramps-merge.svg b/images/scalable/gramps-merge.svg similarity index 100% rename from gramps/images/scalable/gramps-merge.svg rename to images/scalable/gramps-merge.svg diff --git a/gramps/images/scalable/gramps-notes.svg b/images/scalable/gramps-notes.svg similarity index 100% rename from gramps/images/scalable/gramps-notes.svg rename to images/scalable/gramps-notes.svg diff --git a/gramps/images/scalable/gramps-parents-add.svg b/images/scalable/gramps-parents-add.svg similarity index 100% rename from gramps/images/scalable/gramps-parents-add.svg rename to images/scalable/gramps-parents-add.svg diff --git a/gramps/images/scalable/gramps-parents-open.svg b/images/scalable/gramps-parents-open.svg similarity index 100% rename from gramps/images/scalable/gramps-parents-open.svg rename to images/scalable/gramps-parents-open.svg diff --git a/gramps/images/scalable/gramps-parents.svg b/images/scalable/gramps-parents.svg similarity index 100% rename from gramps/images/scalable/gramps-parents.svg rename to images/scalable/gramps-parents.svg diff --git a/gramps/images/scalable/gramps-pedigree.svg b/images/scalable/gramps-pedigree.svg similarity index 100% rename from gramps/images/scalable/gramps-pedigree.svg rename to images/scalable/gramps-pedigree.svg diff --git a/gramps/images/scalable/gramps-person.svg b/images/scalable/gramps-person.svg similarity index 100% rename from gramps/images/scalable/gramps-person.svg rename to images/scalable/gramps-person.svg diff --git a/gramps/images/scalable/gramps-place.svg b/images/scalable/gramps-place.svg similarity index 100% rename from gramps/images/scalable/gramps-place.svg rename to images/scalable/gramps-place.svg diff --git a/gramps/images/scalable/gramps-relation.svg b/images/scalable/gramps-relation.svg similarity index 100% rename from gramps/images/scalable/gramps-relation.svg rename to images/scalable/gramps-relation.svg diff --git a/gramps/images/scalable/gramps-reports.svg b/images/scalable/gramps-reports.svg similarity index 100% rename from gramps/images/scalable/gramps-reports.svg rename to images/scalable/gramps-reports.svg diff --git a/gramps/images/scalable/gramps-repository.svg b/images/scalable/gramps-repository.svg similarity index 100% rename from gramps/images/scalable/gramps-repository.svg rename to images/scalable/gramps-repository.svg diff --git a/gramps/images/scalable/gramps-source.svg b/images/scalable/gramps-source.svg similarity index 100% rename from gramps/images/scalable/gramps-source.svg rename to images/scalable/gramps-source.svg diff --git a/gramps/images/scalable/gramps-spouse.svg b/images/scalable/gramps-spouse.svg similarity index 100% rename from gramps/images/scalable/gramps-spouse.svg rename to images/scalable/gramps-spouse.svg diff --git a/gramps/images/scalable/gramps-tag-new.svg b/images/scalable/gramps-tag-new.svg similarity index 100% rename from gramps/images/scalable/gramps-tag-new.svg rename to images/scalable/gramps-tag-new.svg diff --git a/gramps/images/scalable/gramps-tag.svg b/images/scalable/gramps-tag.svg similarity index 100% rename from gramps/images/scalable/gramps-tag.svg rename to images/scalable/gramps-tag.svg diff --git a/gramps/images/scalable/gramps-tools.svg b/images/scalable/gramps-tools.svg similarity index 100% rename from gramps/images/scalable/gramps-tools.svg rename to images/scalable/gramps-tools.svg diff --git a/gramps/images/scalable/gramps-tree-group.svg b/images/scalable/gramps-tree-group.svg similarity index 100% rename from gramps/images/scalable/gramps-tree-group.svg rename to images/scalable/gramps-tree-group.svg diff --git a/gramps/images/scalable/gramps-tree-list.svg b/images/scalable/gramps-tree-list.svg similarity index 100% rename from gramps/images/scalable/gramps-tree-list.svg rename to images/scalable/gramps-tree-list.svg diff --git a/gramps/images/scalable/gramps-tree-select.svg b/images/scalable/gramps-tree-select.svg similarity index 100% rename from gramps/images/scalable/gramps-tree-select.svg rename to images/scalable/gramps-tree-select.svg diff --git a/gramps/images/scalable/gramps-unlock.svg b/images/scalable/gramps-unlock.svg similarity index 100% rename from gramps/images/scalable/gramps-unlock.svg rename to images/scalable/gramps-unlock.svg diff --git a/gramps/images/scalable/gramps-view.svg b/images/scalable/gramps-view.svg similarity index 100% rename from gramps/images/scalable/gramps-view.svg rename to images/scalable/gramps-view.svg diff --git a/gramps/images/scalable/gramps-viewmedia.svg b/images/scalable/gramps-viewmedia.svg similarity index 100% rename from gramps/images/scalable/gramps-viewmedia.svg rename to images/scalable/gramps-viewmedia.svg diff --git a/gramps/images/scalable/gramps-zoom-best-fit.svg b/images/scalable/gramps-zoom-best-fit.svg similarity index 100% rename from gramps/images/scalable/gramps-zoom-best-fit.svg rename to images/scalable/gramps-zoom-best-fit.svg diff --git a/gramps/images/scalable/gramps-zoom-fit-width.svg b/images/scalable/gramps-zoom-fit-width.svg similarity index 100% rename from gramps/images/scalable/gramps-zoom-fit-width.svg rename to images/scalable/gramps-zoom-fit-width.svg diff --git a/gramps/images/scalable/gramps-zoom-in.svg b/images/scalable/gramps-zoom-in.svg similarity index 100% rename from gramps/images/scalable/gramps-zoom-in.svg rename to images/scalable/gramps-zoom-in.svg diff --git a/gramps/images/scalable/gramps-zoom-out.svg b/images/scalable/gramps-zoom-out.svg similarity index 100% rename from gramps/images/scalable/gramps-zoom-out.svg rename to images/scalable/gramps-zoom-out.svg diff --git a/gramps/images/scalable/gramps.svg b/images/scalable/gramps.svg similarity index 100% rename from gramps/images/scalable/gramps.svg rename to images/scalable/gramps.svg diff --git a/gramps/images/splash.jpg b/images/splash.jpg similarity index 100% rename from gramps/images/splash.jpg rename to images/splash.jpg diff --git a/gramps/images/stock_index_24.png b/images/stock_index_24.png similarity index 100% rename from gramps/images/stock_index_24.png rename to images/stock_index_24.png diff --git a/gramps/images/stock_link.png b/images/stock_link.png similarity index 100% rename from gramps/images/stock_link.png rename to images/stock_link.png diff --git a/gramps/images/stock_new-html.png b/images/stock_new-html.png similarity index 100% rename from gramps/images/stock_new-html.png rename to images/stock_new-html.png diff --git a/gramps/images/stock_notes.png b/images/stock_notes.png similarity index 100% rename from gramps/images/stock_notes.png rename to images/stock_notes.png diff --git a/gramps/images/text-editor.png b/images/text-editor.png similarity index 100% rename from gramps/images/text-editor.png rename to images/text-editor.png diff --git a/gramps/images/up.png b/images/up.png similarity index 100% rename from gramps/images/up.png rename to images/up.png diff --git a/setup.py b/setup.py index 15ee63785..cbf54c9a4 100644 --- a/setup.py +++ b/setup.py @@ -47,11 +47,11 @@ if sys.version_info[0] < 3: import commands from stat import ST_MODE -VERSION = '4.0.0-alpha3' +VERSION = '4.0.0' ALL_LINGUAS = ('bg', 'ca', 'cs', 'da', 'de', 'el', 'en_GB', 'es', 'fi', 'fr', 'he', 'hr', 'hu', 'it', 'ja', 'lt', 'nb', 'nl', 'nn', 'pl', 'pt_BR', 'pt_PT', 'ru', 'sk', 'sl', 'sq', 'sv', 'uk', 'vi', 'zh_CN') -INTLTOOL_FILES = ('gramps/data/tips.xml', 'gramps/plugins/lib/holidays.xml') +INTLTOOL_FILES = ('data/tips.xml', 'gramps/plugins/lib/holidays.xml') def intltool_version(): ''' @@ -241,15 +241,18 @@ def write_const_py(command): const_py = os.path.join('gramps', 'gen', 'const.py') if hasattr(command, 'install_data'): #during install + share_dir = os.path.join(command.install_data, 'share') locale_dir = os.path.join(command.install_data, 'share', 'locale') else: #in build if 'install' in command.distribution.command_obj: # Prevent overwriting version created during install return + share_dir = '' locale_dir = os.path.join(command.build_base, 'mo') subst_vars = (('@VERSIONSTRING@', VERSION), + ('@SHARE_DIR@', share_dir), ('@LOCALE_DIR@', locale_dir)) substitute_variables(const_py_in, const_py, subst_vars) @@ -307,21 +310,14 @@ GEDCOM_FILES = glob.glob(os.path.join('example', 'gedcom', '*.*')) GRAMPS_FILES = glob.glob(os.path.join('example', 'gramps', '*.*')) PNG_FILES = glob.glob(os.path.join('data', '*.png')) SVG_FILES = glob.glob(os.path.join('data', '*.svg')) +XML_FILES = glob.glob(os.path.join('data', '*.xml')) +IMAGE_FILES = glob.glob(os.path.join('images', '*.*')) +IMAGE_16 = glob.glob(os.path.join('images', '16x16', '*.png')) +IMAGE_22 = glob.glob(os.path.join('images', '22x22', '*.png')) +IMAGE_48 = glob.glob(os.path.join('images', '48x48', '*.png')) +IMAGE_SC = glob.glob(os.path.join('images', 'scalable', '*.svg')) -data_list = [ - 'data/*.txt', - 'data/*.xml', - 'gui/glade/*.glade', - 'images/*.ico', - 'images/*.png', - 'images/splash.jpg', - 'images/*.svg', - 'images/16x16/*.png', - 'images/22x22/*.png', - 'images/48x48/*.png', - 'images/scalable/*.svg' - ] - +data_list = ['gui/glade/*.glade'] # add all subdirs of plugin with glade: basedir = os.path.join('gramps', 'plugins') for (dirpath, dirnames, filenames) in os.walk(basedir): @@ -433,5 +429,12 @@ setup(name = 'gramps', ('share/icons', ['gramps/images/gramps.png']), ('share/doc/gramps/example/gedcom', GEDCOM_FILES), ('share/doc/gramps/example/gramps', GRAMPS_FILES), - ('share/doc/gramps', DOC_FILES)] + ('share/doc/gramps', DOC_FILES), + ('share/gramps', XML_FILES), + ('share/gramps/icons/hicolor', IMAGE_FILES), + ('share/gramps/icons/hicolor/16x16', IMAGE_16), + ('share/gramps/icons/hicolor/22x22', IMAGE_22), + ('share/gramps/icons/hicolor/48x48', IMAGE_48), + ('share/gramps/icons/hicolor/scalable', IMAGE_SC), + ] )