diff --git a/configure.in b/configure.in index 9d1ae1816..ecaae5e11 100644 --- a/configure.in +++ b/configure.in @@ -123,6 +123,7 @@ src/gui/editors/Makefile src/gui/editors/displaytabs/Makefile src/gui/filters/Makefile src/gui/filters/sidebar/Makefile +src/gui/glade/Makefile src/gui/plug/Makefile src/gui/plug/report/Makefile src/gui/selectors/Makefile @@ -156,7 +157,6 @@ src/plugins/webstuff/css/Makefile src/plugins/webstuff/images/Makefile src/plugins/webstuff/javascript/Makefile src/data/Makefile -src/glade/Makefile src/images/Makefile src/images/16x16/Makefile src/images/22x22/Makefile diff --git a/po/POTFILES.in b/po/POTFILES.in index d51ab6a13..179698a1b 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -696,54 +696,54 @@ src/Simple/_SimpleAccess.py # Glade files # src/plugins/docgen/gtkprint.glade -src/glade/editperson.glade -src/glade/grampletpane.glade -src/glade/baseselector.glade -src/glade/reorder.glade -src/glade/tipofday.glade -src/glade/displaystate.glade -src/glade/addmedia.glade -src/glade/questiondialog.glade -src/glade/configure.glade -src/glade/dateedit.glade -src/glade/editsource.glade -src/glade/styleeditor.glade -src/glade/dbman.glade -src/glade/editcitation.glade -src/glade/editurl.glade -src/glade/editrepository.glade -src/glade/editreporef.glade -src/glade/editpersonref.glade -src/glade/editlocation.glade -src/glade/editlink.glade -src/glade/editfamily.glade -src/glade/editchildref.glade -src/glade/editattribute.glade -src/glade/editaddress.glade -src/glade/editmedia.glade -src/glade/editmediaref.glade -src/glade/editeventref.glade -src/glade/editldsord.glade -src/glade/editnote.glade -src/glade/editplace.glade -src/glade/editsourceref.glade -src/glade/editname.glade -src/glade/editevent.glade -src/glade/mergecitation.glade -src/glade/mergedata.glade -src/glade/mergeevent.glade -src/glade/mergefamily.glade -src/glade/mergemedia.glade -src/glade/mergenote.glade -src/glade/mergeperson.glade -src/glade/mergeplace.glade -src/glade/mergerepository.glade -src/glade/mergesource.glade -src/glade/plugins.glade -src/glade/rule.glade -src/glade/scratchpad.glade -src/glade/papermenu.glade -src/glade/updateaddons.glade +src/gui/glade/editperson.glade +src/gui/glade/grampletpane.glade +src/gui/glade/baseselector.glade +src/gui/glade/reorder.glade +src/gui/glade/tipofday.glade +src/gui/glade/displaystate.glade +src/gui/glade/addmedia.glade +src/gui/glade/questiondialog.glade +src/gui/glade/configure.glade +src/gui/glade/dateedit.glade +src/gui/glade/editsource.glade +src/gui/glade/styleeditor.glade +src/gui/glade/dbman.glade +src/gui/glade/editcitation.glade +src/gui/glade/editurl.glade +src/gui/glade/editrepository.glade +src/gui/glade/editreporef.glade +src/gui/glade/editpersonref.glade +src/gui/glade/editlocation.glade +src/gui/glade/editlink.glade +src/gui/glade/editfamily.glade +src/gui/glade/editchildref.glade +src/gui/glade/editattribute.glade +src/gui/glade/editaddress.glade +src/gui/glade/editmedia.glade +src/gui/glade/editmediaref.glade +src/gui/glade/editeventref.glade +src/gui/glade/editldsord.glade +src/gui/glade/editnote.glade +src/gui/glade/editplace.glade +src/gui/glade/editsourceref.glade +src/gui/glade/editname.glade +src/gui/glade/editevent.glade +src/gui/glade/mergecitation.glade +src/gui/glade/mergedata.glade +src/gui/glade/mergeevent.glade +src/gui/glade/mergefamily.glade +src/gui/glade/mergemedia.glade +src/gui/glade/mergenote.glade +src/gui/glade/mergeperson.glade +src/gui/glade/mergeplace.glade +src/gui/glade/mergerepository.glade +src/gui/glade/mergesource.glade +src/gui/glade/plugins.glade +src/gui/glade/rule.glade +src/gui/glade/scratchpad.glade +src/gui/glade/papermenu.glade +src/gui/glade/updateaddons.glade src/plugins/tool/notrelated.glade src/plugins/bookreport.glade src/plugins/tool/changenames.glade diff --git a/po/POTFILES.skip b/po/POTFILES.skip index cacf87786..bc113bf6c 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -370,7 +370,7 @@ src/webapp/utils.py # # Glade files # -src/glade/gramps.glade +src/gui/glade/gramps.glade src/plugins/export/exportcsv.glade src/plugins/export/exportftree.glade src/plugins/export/exportgeneweb.glade diff --git a/src/Makefile.am b/src/Makefile.am index e69dea569..3004380ea 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,7 +6,6 @@ SUBDIRS = \ data \ docgen \ gen \ - glade \ GrampsLocale \ GrampsLogger \ gui \ diff --git a/src/const.py.in b/src/const.py.in index b53a5a65a..42d127312 100644 --- 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") diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 950c677ae..1f08dc2f0 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -7,6 +7,7 @@ SUBDIRS = \ editors \ filters \ + glade \ plug \ selectors \ views \ diff --git a/src/glade/Makefile.am b/src/gui/glade/Makefile.am similarity index 95% rename from src/glade/Makefile.am rename to src/gui/glade/Makefile.am index fd5942c31..849e8a43b 100644 --- a/src/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\ diff --git a/src/glade/addmedia.glade b/src/gui/glade/addmedia.glade similarity index 100% rename from src/glade/addmedia.glade rename to src/gui/glade/addmedia.glade diff --git a/src/glade/baseselector.glade b/src/gui/glade/baseselector.glade similarity index 100% rename from src/glade/baseselector.glade rename to src/gui/glade/baseselector.glade diff --git a/src/glade/catalog/README b/src/gui/glade/catalog/README similarity index 100% rename from src/glade/catalog/README rename to src/gui/glade/catalog/README diff --git a/src/glade/catalog/grampswidgets.py b/src/gui/glade/catalog/grampswidgets.py similarity index 100% rename from src/glade/catalog/grampswidgets.py rename to src/gui/glade/catalog/grampswidgets.py diff --git a/src/glade/catalog/grampswidgets.xml b/src/gui/glade/catalog/grampswidgets.xml similarity index 100% rename from src/glade/catalog/grampswidgets.xml rename to src/gui/glade/catalog/grampswidgets.xml diff --git a/src/glade/configure.glade b/src/gui/glade/configure.glade similarity index 100% rename from src/glade/configure.glade rename to src/gui/glade/configure.glade diff --git a/src/glade/dateedit.glade b/src/gui/glade/dateedit.glade similarity index 100% rename from src/glade/dateedit.glade rename to src/gui/glade/dateedit.glade diff --git a/src/glade/dbman.glade b/src/gui/glade/dbman.glade similarity index 100% rename from src/glade/dbman.glade rename to src/gui/glade/dbman.glade diff --git a/src/glade/displaystate.glade b/src/gui/glade/displaystate.glade similarity index 100% rename from src/glade/displaystate.glade rename to src/gui/glade/displaystate.glade diff --git a/src/glade/editaddress.glade b/src/gui/glade/editaddress.glade similarity index 100% rename from src/glade/editaddress.glade rename to src/gui/glade/editaddress.glade diff --git a/src/glade/editattribute.glade b/src/gui/glade/editattribute.glade similarity index 100% rename from src/glade/editattribute.glade rename to src/gui/glade/editattribute.glade diff --git a/src/glade/editchildref.glade b/src/gui/glade/editchildref.glade similarity index 100% rename from src/glade/editchildref.glade rename to src/gui/glade/editchildref.glade diff --git a/src/glade/editcitation.glade b/src/gui/glade/editcitation.glade similarity index 100% rename from src/glade/editcitation.glade rename to src/gui/glade/editcitation.glade diff --git a/src/glade/editevent.glade b/src/gui/glade/editevent.glade similarity index 100% rename from src/glade/editevent.glade rename to src/gui/glade/editevent.glade diff --git a/src/glade/editeventref.glade b/src/gui/glade/editeventref.glade similarity index 100% rename from src/glade/editeventref.glade rename to src/gui/glade/editeventref.glade diff --git a/src/glade/editfamily.glade b/src/gui/glade/editfamily.glade similarity index 100% rename from src/glade/editfamily.glade rename to src/gui/glade/editfamily.glade diff --git a/src/glade/editldsord.glade b/src/gui/glade/editldsord.glade similarity index 100% rename from src/glade/editldsord.glade rename to src/gui/glade/editldsord.glade diff --git a/src/glade/editlink.glade b/src/gui/glade/editlink.glade similarity index 100% rename from src/glade/editlink.glade rename to src/gui/glade/editlink.glade diff --git a/src/glade/editlocation.glade b/src/gui/glade/editlocation.glade similarity index 100% rename from src/glade/editlocation.glade rename to src/gui/glade/editlocation.glade diff --git a/src/glade/editmedia.glade b/src/gui/glade/editmedia.glade similarity index 100% rename from src/glade/editmedia.glade rename to src/gui/glade/editmedia.glade diff --git a/src/glade/editmediaref.glade b/src/gui/glade/editmediaref.glade similarity index 100% rename from src/glade/editmediaref.glade rename to src/gui/glade/editmediaref.glade diff --git a/src/glade/editname.glade b/src/gui/glade/editname.glade similarity index 100% rename from src/glade/editname.glade rename to src/gui/glade/editname.glade diff --git a/src/glade/editnote.glade b/src/gui/glade/editnote.glade similarity index 100% rename from src/glade/editnote.glade rename to src/gui/glade/editnote.glade diff --git a/src/glade/editperson.glade b/src/gui/glade/editperson.glade similarity index 100% rename from src/glade/editperson.glade rename to src/gui/glade/editperson.glade diff --git a/src/glade/editpersonref.glade b/src/gui/glade/editpersonref.glade similarity index 100% rename from src/glade/editpersonref.glade rename to src/gui/glade/editpersonref.glade diff --git a/src/glade/editplace.glade b/src/gui/glade/editplace.glade similarity index 100% rename from src/glade/editplace.glade rename to src/gui/glade/editplace.glade diff --git a/src/glade/editreporef.glade b/src/gui/glade/editreporef.glade similarity index 100% rename from src/glade/editreporef.glade rename to src/gui/glade/editreporef.glade diff --git a/src/glade/editrepository.glade b/src/gui/glade/editrepository.glade similarity index 100% rename from src/glade/editrepository.glade rename to src/gui/glade/editrepository.glade diff --git a/src/glade/editsource.glade b/src/gui/glade/editsource.glade similarity index 100% rename from src/glade/editsource.glade rename to src/gui/glade/editsource.glade diff --git a/src/glade/editsourceref.glade b/src/gui/glade/editsourceref.glade similarity index 100% rename from src/glade/editsourceref.glade rename to src/gui/glade/editsourceref.glade diff --git a/src/glade/editurl.glade b/src/gui/glade/editurl.glade similarity index 100% rename from src/glade/editurl.glade rename to src/gui/glade/editurl.glade diff --git a/src/glade/grampletpane.glade b/src/gui/glade/grampletpane.glade similarity index 100% rename from src/glade/grampletpane.glade rename to src/gui/glade/grampletpane.glade diff --git a/src/glade/gramps.glade b/src/gui/glade/gramps.glade similarity index 100% rename from src/glade/gramps.glade rename to src/gui/glade/gramps.glade diff --git a/src/glade/mergecitation.glade b/src/gui/glade/mergecitation.glade similarity index 100% rename from src/glade/mergecitation.glade rename to src/gui/glade/mergecitation.glade diff --git a/src/glade/mergedata.glade b/src/gui/glade/mergedata.glade similarity index 100% rename from src/glade/mergedata.glade rename to src/gui/glade/mergedata.glade diff --git a/src/glade/mergeevent.glade b/src/gui/glade/mergeevent.glade similarity index 100% rename from src/glade/mergeevent.glade rename to src/gui/glade/mergeevent.glade diff --git a/src/glade/mergefamily.glade b/src/gui/glade/mergefamily.glade similarity index 100% rename from src/glade/mergefamily.glade rename to src/gui/glade/mergefamily.glade diff --git a/src/glade/mergemedia.glade b/src/gui/glade/mergemedia.glade similarity index 100% rename from src/glade/mergemedia.glade rename to src/gui/glade/mergemedia.glade diff --git a/src/glade/mergenote.glade b/src/gui/glade/mergenote.glade similarity index 100% rename from src/glade/mergenote.glade rename to src/gui/glade/mergenote.glade diff --git a/src/glade/mergeperson.glade b/src/gui/glade/mergeperson.glade similarity index 100% rename from src/glade/mergeperson.glade rename to src/gui/glade/mergeperson.glade diff --git a/src/glade/mergeplace.glade b/src/gui/glade/mergeplace.glade similarity index 100% rename from src/glade/mergeplace.glade rename to src/gui/glade/mergeplace.glade diff --git a/src/glade/mergerepository.glade b/src/gui/glade/mergerepository.glade similarity index 100% rename from src/glade/mergerepository.glade rename to src/gui/glade/mergerepository.glade diff --git a/src/glade/mergesource.glade b/src/gui/glade/mergesource.glade similarity index 100% rename from src/glade/mergesource.glade rename to src/gui/glade/mergesource.glade diff --git a/src/glade/papermenu.glade b/src/gui/glade/papermenu.glade similarity index 100% rename from src/glade/papermenu.glade rename to src/gui/glade/papermenu.glade diff --git a/src/glade/plugins.glade b/src/gui/glade/plugins.glade similarity index 100% rename from src/glade/plugins.glade rename to src/gui/glade/plugins.glade diff --git a/src/glade/questiondialog.glade b/src/gui/glade/questiondialog.glade similarity index 100% rename from src/glade/questiondialog.glade rename to src/gui/glade/questiondialog.glade diff --git a/src/glade/reorder.glade b/src/gui/glade/reorder.glade similarity index 100% rename from src/glade/reorder.glade rename to src/gui/glade/reorder.glade diff --git a/src/glade/rule.glade b/src/gui/glade/rule.glade similarity index 100% rename from src/glade/rule.glade rename to src/gui/glade/rule.glade diff --git a/src/glade/scratchpad.glade b/src/gui/glade/scratchpad.glade similarity index 100% rename from src/glade/scratchpad.glade rename to src/gui/glade/scratchpad.glade diff --git a/src/glade/styleeditor.glade b/src/gui/glade/styleeditor.glade similarity index 100% rename from src/glade/styleeditor.glade rename to src/gui/glade/styleeditor.glade diff --git a/src/glade/tipofday.glade b/src/gui/glade/tipofday.glade similarity index 100% rename from src/glade/tipofday.glade rename to src/gui/glade/tipofday.glade diff --git a/src/glade/updateaddons.glade b/src/gui/glade/updateaddons.glade similarity index 100% rename from src/glade/updateaddons.glade rename to src/gui/glade/updateaddons.glade