From e70a28963ff9754d3257361fad93aebf59edee08 Mon Sep 17 00:00:00 2001 From: lains Date: Sun, 18 Nov 2018 22:59:14 +0100 Subject: Refactoring:Xmlconfig:Moving layout definition in their own .xml file (makes main navit.xml file lighter) (#559) Layouts contain quite heavy xml code, and there are many layouts available for navit. They are all inserted inside the main navit.xml, which makes it hard to edit because of its size, even if changes or customizations by users are very rarely on the layout code. I have thus moved the layout code away from navit.xml, each layout having its own xml definition file, called navit_layout_*.xml These files are inserted inside the main navit.xml file by using the already existing xi:include mechanism, this also allow for backwards compatibility (old monolithic navit.xml files are still valid and can be used). The other advantage for this is that f the user wants to have his/her own customized navit.xml, he/she can still include the shipped layout files, making their xml lighter. This also allow to enable/disable specific layouts easily by including or not each layout file. It is also easier to perform side-by-side comparison between two layout files. --- contrib/sailfish/navit-sailfish.spec | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'contrib') diff --git a/contrib/sailfish/navit-sailfish.spec b/contrib/sailfish/navit-sailfish.spec index 11980a77c..4f14be872 100755 --- a/contrib/sailfish/navit-sailfish.spec +++ b/contrib/sailfish/navit-sailfish.spec @@ -114,6 +114,12 @@ fi %files %defattr(644, root, root, 755) %{_datadir}/harbour-navit/navit.xml +%{_datadir}/harbour-navit/navit_layout_bike.xml +%{_datadir}/harbour-navit/navit_layout_car.xml +%{_datadir}/harbour-navit/navit_layout_car_android.xml +%{_datadir}/harbour-navit/navit_layout_car_dark.xml +%{_datadir}/harbour-navit/navit_layout_car_simple.xml +%{_datadir}/harbour-navit/navit_layout_th.xml %{_datadir}/harbour-navit/icons/ %{_datadir}/harbour-navit/maps/osm_bbox_11.3,47.9,11.7,48.2.bin %{_datadir}/harbour-navit/espeak-data/ -- cgit v1.2.1