GEPS008: Move glade directory

svn: r19659
2012-05-26 17:33:53 +00:00
parent 6919546a0f
commit e99da22e7d
59 changed files with 53 additions and 53 deletions
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,6 @@ SUBDIRS = \
 	data \
 	docgen \
 	gen \
-	glade \
 	GrampsLocale \
 	GrampsLogger \
 	gui \
--- a/src/const.py.in
+++ b/src/const.py.in
@@ -169,7 +169,7 @@ LICENSE_FILE   = os.path.join(ROOT_DIR, "COPYING")
 # Glade files
 #

-GLADE_DIR      = os.path.join(ROOT_DIR, "glade")
+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")
 PLUGINS_GLADE  = os.path.join(GLADE_DIR, "plugins.glade")
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -7,6 +7,7 @@
 SUBDIRS = \
 	editors \
 	filters \
+	glade \
 	plug \
 	selectors \
 	views \
--- a/src/gui/glade/Makefile.am
+++ b/src/gui/glade/Makefile.am
@@ -1,7 +1,7 @@
 # This is the src/data level Makefile
 # $Id$
 #
-pkgdatadir = $(datadir)/@PACKAGE@/glade
+pkgdatadir = $(datadir)/@PACKAGE@/gui/glade

 dist_pkgdata_DATA = \
 	gramps.glade\
--- a/src/gui/glade/addmedia.glade
+++ b/src/gui/glade/addmedia.glade
--- a/src/gui/glade/baseselector.glade
+++ b/src/gui/glade/baseselector.glade
--- a/src/gui/glade/catalog/README
+++ b/src/gui/glade/catalog/README
--- a/src/gui/glade/catalog/grampswidgets.py
+++ b/src/gui/glade/catalog/grampswidgets.py
--- a/src/gui/glade/catalog/grampswidgets.xml
+++ b/src/gui/glade/catalog/grampswidgets.xml
--- a/src/gui/glade/configure.glade
+++ b/src/gui/glade/configure.glade
--- a/src/gui/glade/dateedit.glade
+++ b/src/gui/glade/dateedit.glade
--- a/src/gui/glade/dbman.glade
+++ b/src/gui/glade/dbman.glade
--- a/src/gui/glade/displaystate.glade
+++ b/src/gui/glade/displaystate.glade
--- a/src/gui/glade/editaddress.glade
+++ b/src/gui/glade/editaddress.glade
--- a/src/gui/glade/editattribute.glade
+++ b/src/gui/glade/editattribute.glade
--- a/src/gui/glade/editchildref.glade
+++ b/src/gui/glade/editchildref.glade
--- a/src/gui/glade/editcitation.glade
+++ b/src/gui/glade/editcitation.glade
--- a/src/gui/glade/editevent.glade
+++ b/src/gui/glade/editevent.glade
--- a/src/gui/glade/editeventref.glade
+++ b/src/gui/glade/editeventref.glade
--- a/src/gui/glade/editfamily.glade
+++ b/src/gui/glade/editfamily.glade
--- a/src/gui/glade/editldsord.glade
+++ b/src/gui/glade/editldsord.glade
--- a/src/gui/glade/editlink.glade
+++ b/src/gui/glade/editlink.glade
--- a/src/gui/glade/editlocation.glade
+++ b/src/gui/glade/editlocation.glade
--- a/src/gui/glade/editmedia.glade
+++ b/src/gui/glade/editmedia.glade
--- a/src/gui/glade/editmediaref.glade
+++ b/src/gui/glade/editmediaref.glade
--- a/src/gui/glade/editname.glade
+++ b/src/gui/glade/editname.glade
--- a/src/gui/glade/editnote.glade
+++ b/src/gui/glade/editnote.glade
--- a/src/gui/glade/editperson.glade
+++ b/src/gui/glade/editperson.glade
--- a/src/gui/glade/editpersonref.glade
+++ b/src/gui/glade/editpersonref.glade
--- a/src/gui/glade/editplace.glade
+++ b/src/gui/glade/editplace.glade
--- a/src/gui/glade/editreporef.glade
+++ b/src/gui/glade/editreporef.glade
--- a/src/gui/glade/editrepository.glade
+++ b/src/gui/glade/editrepository.glade
--- a/src/gui/glade/editsource.glade
+++ b/src/gui/glade/editsource.glade
--- a/src/gui/glade/editsourceref.glade
+++ b/src/gui/glade/editsourceref.glade
--- a/src/gui/glade/editurl.glade
+++ b/src/gui/glade/editurl.glade
--- a/src/gui/glade/grampletpane.glade
+++ b/src/gui/glade/grampletpane.glade
--- a/src/gui/glade/gramps.glade
+++ b/src/gui/glade/gramps.glade
--- a/src/gui/glade/mergecitation.glade
+++ b/src/gui/glade/mergecitation.glade
--- a/src/gui/glade/mergedata.glade
+++ b/src/gui/glade/mergedata.glade
--- a/src/gui/glade/mergeevent.glade
+++ b/src/gui/glade/mergeevent.glade
--- a/src/gui/glade/mergefamily.glade
+++ b/src/gui/glade/mergefamily.glade
--- a/src/gui/glade/mergemedia.glade
+++ b/src/gui/glade/mergemedia.glade
--- a/src/gui/glade/mergenote.glade
+++ b/src/gui/glade/mergenote.glade
--- a/src/gui/glade/mergeperson.glade
+++ b/src/gui/glade/mergeperson.glade
--- a/src/gui/glade/mergeplace.glade
+++ b/src/gui/glade/mergeplace.glade
--- a/src/gui/glade/mergerepository.glade
+++ b/src/gui/glade/mergerepository.glade
--- a/src/gui/glade/mergesource.glade
+++ b/src/gui/glade/mergesource.glade
--- a/src/gui/glade/papermenu.glade
+++ b/src/gui/glade/papermenu.glade
--- a/src/gui/glade/plugins.glade
+++ b/src/gui/glade/plugins.glade
--- a/src/gui/glade/questiondialog.glade
+++ b/src/gui/glade/questiondialog.glade
--- a/src/gui/glade/reorder.glade
+++ b/src/gui/glade/reorder.glade
--- a/src/gui/glade/rule.glade
+++ b/src/gui/glade/rule.glade
--- a/src/gui/glade/scratchpad.glade
+++ b/src/gui/glade/scratchpad.glade
--- a/src/gui/glade/styleeditor.glade
+++ b/src/gui/glade/styleeditor.glade
--- a/src/gui/glade/tipofday.glade
+++ b/src/gui/glade/tipofday.glade
--- a/src/gui/glade/updateaddons.glade
+++ b/src/gui/glade/updateaddons.glade