diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2009-08-20 11:16:58 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2009-08-20 11:16:58 +0000 |
| commit | 51c464b571e81faa1a9330aadc060ebbc3ba81a7 (patch) | |
| tree | 662ffc513ccae6584ce3e6f3e078d6db6067ce0b /navit/xslt | |
| parent | 1ff7854313db3eedb5f5a2e4a0d8055ac8e4dafe (diff) | |
| download | navit-svn-51c464b571e81faa1a9330aadc060ebbc3ba81a7.tar.gz | |
Fix:Build:Fixed some errors
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@2496 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/xslt')
| -rw-r--r-- | navit/xslt/android.xslt | 18 | ||||
| -rw-r--r-- | navit/xslt/default_plugins.xslt | 1 | ||||
| -rw-r--r-- | navit/xslt/osd_minimum.xslt | 18 |
3 files changed, 21 insertions, 16 deletions
diff --git a/navit/xslt/android.xslt b/navit/xslt/android.xslt index 0fccb7d5..c35647cc 100644 --- a/navit/xslt/android.xslt +++ b/navit/xslt/android.xslt @@ -4,33 +4,19 @@ <xsl:include href="default_plugins.xslt"/> <xsl:include href="gui_internal.xslt"/> <xsl:include href="map_sdcard_navitmap_bin.xslt"/> + <xsl:include href="osd_minimum.xslt"/> <xsl:template match="/config/plugins/plugin[1]" priority="100"> <plugin path="$NAVIT_PREFIX/lib/libgraphics_android.so" ondemand="no"/> <xsl:text>
 </xsl:text> <plugin path="$NAVIT_PREFIX/lib/libvehicle_android.so" ondemand="no"/> <xsl:text>
 </xsl:text> - <plugin path="$NAVIT_PREFIX/lib/libspeech_android.so" enabled="yes" ondemand="no"/> + <plugin path="$NAVIT_PREFIX/lib/libspeech_android.so" ondemand="no"/> <xsl:text>
 </xsl:text> <xsl:next-match/> </xsl:template> <xsl:template match="/config/navit/graphics"> <graphics type="android" /> </xsl:template> - <xsl:template match="/config/navit/osd[1]"> - <osd type="compass" enabled="yes" x="-60" y="-80"/> - <xsl:text>
 </xsl:text> - <osd type="text" label="${{navigation.item.destination_length[named]}}\n${{navigation.item.destination_time[arrival]}}" x="-60" y="0" w="60" h="40"/> - <xsl:text>
 </xsl:text> - <osd type="navigation_next_turn" x="0" y="-60" w="60" h="40" icon_src="%s_wh_44_44.png"/> - <xsl:text>
 </xsl:text> - <osd type="text" label="${{navigation.item[1].length[named]}}" x="0" y="-20"/> - <xsl:text>
 </xsl:text> - <osd type="button" src="gui_zoom_in_64_64.png" command="zoom_in()" x="0" y="0"/> - <xsl:text>
 </xsl:text> - <osd type="button" src="gui_zoom_out_64_64.png" command="zoom_out()" x="0" y="70"/> - <xsl:text>
 </xsl:text> - <xsl:copy><xsl:copy-of select="@*|node()"/></xsl:copy> - </xsl:template> <xsl:template match="/config/navit/vehicle[1]"> <xsl:copy><xsl:copy-of select="@*[not(name()='gpsd_query')]"/> <xsl:attribute name="source">android:</xsl:attribute> diff --git a/navit/xslt/default_plugins.xslt b/navit/xslt/default_plugins.xslt index 43da940a..0d3227c6 100644 --- a/navit/xslt/default_plugins.xslt +++ b/navit/xslt/default_plugins.xslt @@ -9,4 +9,5 @@ <xsl:text>
 </xsl:text> <plugin path="$NAVIT_PREFIX/lib/libosd_core.so" ondemand="no"/> </xsl:template> + <xsl:template match="/config/plugins/plugin"/> </xsl:transform> diff --git a/navit/xslt/osd_minimum.xslt b/navit/xslt/osd_minimum.xslt new file mode 100644 index 00000000..38b26657 --- /dev/null +++ b/navit/xslt/osd_minimum.xslt @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<xsl:transform version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xsl:template match="/config/navit/osd[1]"> + <osd type="compass" enabled="yes" x="-60" y="-80"/> + <xsl:text>
 </xsl:text> + <osd type="text" label="${{navigation.item.destination_length[named]}}\n${{navigation.item.destination_time[arrival]}}" x="-60" y="0" w="60" h="40"/> + <xsl:text>
 </xsl:text> + <osd type="navigation_next_turn" x="0" y="-60" w="60" h="40" icon_src="%s_wh_44_44.png"/> + <xsl:text>
 </xsl:text> + <osd type="text" label="${{navigation.item[1].length[named]}}" x="0" y="-20"/> + <xsl:text>
 </xsl:text> + <osd type="button" src="gui_zoom_in_64_64.png" command="zoom_in()" x="0" y="0"/> + <xsl:text>
 </xsl:text> + <osd type="button" src="gui_zoom_out_64_64.png" command="zoom_out()" x="0" y="70"/> + <xsl:text>
 </xsl:text> + <xsl:copy><xsl:copy-of select="@*|node()"/></xsl:copy> + </xsl:template> +</xsl:transform> |