From d0083b47770f52fc0a588aca169204b6dc2d5d30 Mon Sep 17 00:00:00 2001 From: "Rob G. Healey" Date: Thu, 27 Jan 2011 15:34:52 +0000 Subject: [PATCH] Moved the source images from src/images/scalable to src/plugins/webstuff/images. Removed gramps-geo-altmap.png and gramps-geo-mainmap.png from src/gui/grampsgui.py per Benny Malengier. svn: r16487 --- src/gui/grampsgui.py | 2 - src/images/scalable/Makefile.am | 2 - src/plugins/webstuff/Makefile.am | 43 +++++++++++-------- .../webstuff/images}/gramps-geo-altmap.svg | 0 .../webstuff/images}/gramps-geo-birth.svg | 0 .../webstuff/images}/gramps-geo-death.svg | 0 .../webstuff/images}/gramps-geo-mainmap.svg | 0 .../webstuff/images}/gramps-geo-marriage.svg | 0 8 files changed, 24 insertions(+), 23 deletions(-) rename src/{images/scalable => plugins/webstuff/images}/gramps-geo-altmap.svg (100%) rename src/{images/scalable => plugins/webstuff/images}/gramps-geo-birth.svg (100%) rename src/{images/scalable => plugins/webstuff/images}/gramps-geo-death.svg (100%) rename src/{images/scalable => plugins/webstuff/images}/gramps-geo-mainmap.svg (100%) rename src/{images/scalable => plugins/webstuff/images}/gramps-geo-marriage.svg (100%) diff --git a/src/gui/grampsgui.py b/src/gui/grampsgui.py index 5a9c56711..8302ab598 100644 --- a/src/gui/grampsgui.py +++ b/src/gui/grampsgui.py @@ -117,8 +117,6 @@ def register_stock_icons (): ('gramps-font-bgcolor', _('Font Background Color'), gtk.gdk.CONTROL_MASK, 0, ''), ('gramps-gramplet', _('Gramplets'), gtk.gdk.CONTROL_MASK, 0, ''), ('gramps-geo', _('GeoView'), gtk.gdk.CONTROL_MASK, 0, ''), - ('gramps-geo-mainmap', _('GeoView'), gtk.gdk.CONTROL_MASK, 0, ''), - ('gramps-geo-altmap', _('GeoView'), gtk.gdk.CONTROL_MASK, 0, ''), ('gramps-lock', _('Public'), gtk.gdk.CONTROL_MASK, 0, ''), ('gramps-media', _('Media'), gtk.gdk.CONTROL_MASK, 0, ''), ('gramps-merge', _('Merge'), gtk.gdk.CONTROL_MASK, 0, ''), diff --git a/src/images/scalable/Makefile.am b/src/images/scalable/Makefile.am index e11e90841..5b67ef3fb 100644 --- a/src/images/scalable/Makefile.am +++ b/src/images/scalable/Makefile.am @@ -29,8 +29,6 @@ dist_pkgdata_DATA = \ gramps-font-color.svg \ gramps-font.svg \ gramps-geo.svg \ - gramps-geo-mainmap.svg \ - gramps-geo-altmap.svg \ gramps-gramplet.svg \ gramps-lock.svg \ gramps-media.svg \ diff --git a/src/plugins/webstuff/Makefile.am b/src/plugins/webstuff/Makefile.am index da3744efe..da9c12e40 100644 --- a/src/plugins/webstuff/Makefile.am +++ b/src/plugins/webstuff/Makefile.am @@ -6,9 +6,9 @@ SUBDIRS = DATAFILES = \ - css/GeoView.css \ - css/Mapstraction.css \ - css/ancestortree.css \ + css/GeoView.css \ + css/Mapstraction.css \ + css/ancestortree.css \ css/behaviour.css \ css/Web_Basic-Ash.css \ css/Web_Basic-Blue.css \ @@ -23,31 +23,36 @@ DATAFILES = \ css/Web_Print-Default.css \ css/Web_Visually.css \ images/blank.gif \ - images/crosshairs.png \ + images/crosshairs.png \ images/document.png \ images/favicon2.ico \ images/favicon.ico \ - images/gramps-geo-altmap.png \ - images/gramps-geo-birth.png \ - images/gramps-geo-death.png \ - images/gramps-geo-mainmap.png \ - images/gramps-geo-marriage.png \ - images/somerights20.gif \ + images/gramps-geo-altmap.png \ + images/gramps-geo-altmap.svg \ + images/gramps-geo-birth.png \ + images/gramps-geo-birth.svg \ + images/gramps-geo-death.png \ + images/gramps-geo-death.svg \ + images/gramps-geo-mainmap.png \ + images/gramps-geo-mainmap.svg \ + images/gramps-geo-marriage.png \ + images/gramps-geo-marriage.svg \ + images/somerights20.gif \ images/Web_Gender_Female.png \ images/Web_Gender_Male.png \ images/Web_Mainz_Bkgd.png \ images/Web_Mainz_Header.png \ images/Web_Mainz_Mid.png \ images/Web_Mainz_MidLight.png \ - js/mapstraction/README \ - js/mapstraction/mxn.core.js \ - js/mapstraction/mxn.geocommons.core.js \ - js/mapstraction/mxn.google.core.js \ - js/mapstraction/mxn.googleearth.core.js \ - js/mapstraction/mxn.google.geocoder.js \ - js/mapstraction/mxn.googlev3.core.js \ - js/mapstraction/mxn.js \ - js/mapstraction/mxn.openlayers.core.js + js/mapstraction/README \ + js/mapstraction/mxn.core.js \ + js/mapstraction/mxn.geocommons.core.js \ + js/mapstraction/mxn.google.core.js \ + js/mapstraction/mxn.googleearth.core.js \ + js/mapstraction/mxn.google.geocoder.js \ + js/mapstraction/mxn.googlev3.core.js \ + js/mapstraction/mxn.js \ + js/mapstraction/mxn.openlayers.core.js pkgdatadir = $(datadir)/@PACKAGE@/plugins/webstuff diff --git a/src/images/scalable/gramps-geo-altmap.svg b/src/plugins/webstuff/images/gramps-geo-altmap.svg similarity index 100% rename from src/images/scalable/gramps-geo-altmap.svg rename to src/plugins/webstuff/images/gramps-geo-altmap.svg diff --git a/src/images/scalable/gramps-geo-birth.svg b/src/plugins/webstuff/images/gramps-geo-birth.svg similarity index 100% rename from src/images/scalable/gramps-geo-birth.svg rename to src/plugins/webstuff/images/gramps-geo-birth.svg diff --git a/src/images/scalable/gramps-geo-death.svg b/src/plugins/webstuff/images/gramps-geo-death.svg similarity index 100% rename from src/images/scalable/gramps-geo-death.svg rename to src/plugins/webstuff/images/gramps-geo-death.svg diff --git a/src/images/scalable/gramps-geo-mainmap.svg b/src/plugins/webstuff/images/gramps-geo-mainmap.svg similarity index 100% rename from src/images/scalable/gramps-geo-mainmap.svg rename to src/plugins/webstuff/images/gramps-geo-mainmap.svg diff --git a/src/images/scalable/gramps-geo-marriage.svg b/src/plugins/webstuff/images/gramps-geo-marriage.svg similarity index 100% rename from src/images/scalable/gramps-geo-marriage.svg rename to src/plugins/webstuff/images/gramps-geo-marriage.svg