diff options
| author | zoff99 <zoff99@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-02-13 13:44:13 +0000 |
|---|---|---|
| committer | zoff99 <zoff99@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-02-13 13:44:13 +0000 |
| commit | e1357b923c2f44b86c7ba837488c4580140d3750 (patch) | |
| tree | 758433ff3978398c996ef18ea34f0906fa0e414c /navit/xslt | |
| parent | 6c39932f926619a9b895d0ca71868189603a8e21 (diff) | |
| download | navit-svn-e1357b923c2f44b86c7ba837488c4580140d3750.tar.gz | |
Fix:Android:OSD for different densities
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4153 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/xslt')
| -rw-r--r-- | navit/xslt/android_hdpi.xslt | 20 | ||||
| -rw-r--r-- | navit/xslt/android_ldpi.xslt | 20 | ||||
| -rw-r--r-- | navit/xslt/android_mdpi.xslt | 23 | ||||
| -rw-r--r-- | navit/xslt/osd_android_minimum.xslt | 4 |
4 files changed, 19 insertions, 48 deletions
diff --git a/navit/xslt/android_hdpi.xslt b/navit/xslt/android_hdpi.xslt index 69e54c0d..8db6c633 100644 --- a/navit/xslt/android_hdpi.xslt +++ b/navit/xslt/android_hdpi.xslt @@ -16,27 +16,17 @@ <xsl:otherwise>1</xsl:otherwise> </xsl:choose> </xsl:variable> - <!--<xsl:include href="default_plugins.xslt"/>--> + <xsl:include href="default_plugins.xslt"/> <xsl:include href="map_sdcard_navitmap_bin.xslt"/> <xsl:include href="osd_android_minimum.xslt"/> - <xsl:template match="/config/plugins" priority="100"> - <plugins> - <xsl:text>
 </xsl:text> + <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" ondemand="no"/> - <xsl:text>
 </xsl:text> - <plugin path="$NAVIT_PREFIX/lib/libgui_internal.so" ondemand="no"/> - <xsl:text>
 </xsl:text> - <plugin path="$NAVIT_PREFIX/lib/libmap_textfile.so" ondemand="no"/> - <xsl:text>
 </xsl:text> - <plugin path="$NAVIT_PREFIX/lib/libmap_binfile.so" ondemand="no"/> + <plugin path="$NAVIT_PREFIX/lib/libvehicle_android.so" ondemand="no"/> <xsl:text>
 </xsl:text> - <plugin path="$NAVIT_PREFIX/lib/libosd_core.so" ondemand="no"/> + <plugin path="$NAVIT_PREFIX/lib/libspeech_android.so" ondemand="no"/> <xsl:text>
 </xsl:text> - </plugins> + <xsl:next-match/> </xsl:template> <xsl:template match="/config/navit/graphics"> <graphics type="android" /> diff --git a/navit/xslt/android_ldpi.xslt b/navit/xslt/android_ldpi.xslt index ad72a44b..aae98c55 100644 --- a/navit/xslt/android_ldpi.xslt +++ b/navit/xslt/android_ldpi.xslt @@ -3,27 +3,17 @@ <xsl:output method="xml" doctype-system="navit.dtd" cdata-section-elements="gui"/> <xsl:variable name="OSD_SIZE">1.33</xsl:variable> <xsl:variable name="OSD_FACTOR">0.7</xsl:variable> - <!--<xsl:include href="default_plugins.xslt"/>--> + <xsl:include href="default_plugins.xslt"/> <xsl:include href="map_sdcard_navitmap_bin.xslt"/> <xsl:include href="osd_android_minimum.xslt"/> - <xsl:template match="/config/plugins" priority="100"> - <plugins> - <xsl:text>
 </xsl:text> + <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" ondemand="no"/> - <xsl:text>
 </xsl:text> - <plugin path="$NAVIT_PREFIX/lib/libgui_internal.so" ondemand="no"/> - <xsl:text>
 </xsl:text> - <plugin path="$NAVIT_PREFIX/lib/libmap_textfile.so" ondemand="no"/> - <xsl:text>
 </xsl:text> - <plugin path="$NAVIT_PREFIX/lib/libmap_binfile.so" ondemand="no"/> + <plugin path="$NAVIT_PREFIX/lib/libvehicle_android.so" ondemand="no"/> <xsl:text>
 </xsl:text> - <plugin path="$NAVIT_PREFIX/lib/libosd_core.so" ondemand="no"/> + <plugin path="$NAVIT_PREFIX/lib/libspeech_android.so" ondemand="no"/> <xsl:text>
 </xsl:text> - </plugins> + <xsl:next-match/> </xsl:template> <xsl:template match="/config/navit/graphics"> <graphics type="android" /> diff --git a/navit/xslt/android_mdpi.xslt b/navit/xslt/android_mdpi.xslt index 99316c8c..23e8caf0 100644 --- a/navit/xslt/android_mdpi.xslt +++ b/navit/xslt/android_mdpi.xslt @@ -16,28 +16,19 @@ <xsl:otherwise>1</xsl:otherwise> </xsl:choose> </xsl:variable> - <!--<xsl:include href="default_plugins.xslt"/>--> + <xsl:include href="default_plugins.xslt"/> <xsl:include href="map_sdcard_navitmap_bin.xslt"/> <xsl:include href="osd_android_minimum.xslt"/> - <xsl:template match="/config/plugins" priority="100"> - <plugins> - <xsl:text>
 </xsl:text> + <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" ondemand="no"/> - <xsl:text>
 </xsl:text> - <plugin path="$NAVIT_PREFIX/lib/libgui_internal.so" ondemand="no"/> - <xsl:text>
 </xsl:text> - <plugin path="$NAVIT_PREFIX/lib/libmap_textfile.so" ondemand="no"/> + <plugin path="$NAVIT_PREFIX/lib/libvehicle_android.so" ondemand="no"/> <xsl:text>
 </xsl:text> - <plugin path="$NAVIT_PREFIX/lib/libmap_binfile.so" ondemand="no"/> + <plugin path="$NAVIT_PREFIX/lib/libspeech_android.so" ondemand="no"/> <xsl:text>
 </xsl:text> - <plugin path="$NAVIT_PREFIX/lib/libosd_core.so" ondemand="no"/> - <xsl:text>
 </xsl:text> - </plugins> - </xsl:template> <!-- after map drag jump to position, initial zoom --> + <xsl:next-match/> + </xsl:template> + <!-- after map drag jump to position, initial zoom --> <xsl:template match="/config/navit"> <xsl:copy><xsl:copy-of select="@*"/> <!--<xsl:attribute name="timeout">1</xsl:attribute>--> diff --git a/navit/xslt/osd_android_minimum.xslt b/navit/xslt/osd_android_minimum.xslt index f4a43adc..356014d1 100644 --- a/navit/xslt/osd_android_minimum.xslt +++ b/navit/xslt/osd_android_minimum.xslt @@ -13,11 +13,11 @@ <xsl:otherwise>1</xsl:otherwise> </xsl:choose> </xsl:variable> - <osd type="compass" enabled="yes" x="{round(-60*number($OSD_SIZE_))}" y="{round(-80*number($OSD_SIZE_))}" w="{round(60*number($OSD_SIZE_))}" h="{round(80*number($OSD_SIZE_))}" font_size="{round(200*number($OSD_SIZE_))}" osd_configuration="1"/> + <osd type="compass" enabled="yes" x="{round(-60*number($OSD_SIZE_)*number($OSD_FACTOR_))}" y="{round(-80*number($OSD_SIZE_)*number($OSD_FACTOR_))}" w="{round(60*number($OSD_SIZE_)*number($OSD_FACTOR_))}" h="{round(80*number($OSD_SIZE_)*number($OSD_FACTOR_))}" font_size="{round(200*number($OSD_SIZE_)*number($OSD_FACTOR_))}" osd_configuration="1"/> <xsl:text>
 </xsl:text> <osd type="text" label="${{navigation.item.destination_length[named]}}\n${{navigation.item.destination_time[arrival]}}" x="{round(-60*number($OSD_SIZE_))}" y="0" w="{round(60*number($OSD_SIZE_))}" h="{round(40*number($OSD_SIZE_))}" font_size="{round(200*number($OSD_SIZE_))}" osd_configuration="1"/> <xsl:text>
 </xsl:text> - <osd type="navigation_next_turn" x="0" y="{round(-60*number($OSD_SIZE_))}" w="{round(60*number($OSD_SIZE_))}" h="{round(40*number($OSD_SIZE_))}" icon_src="%s_wh_{round(44*number($OSD_SIZE_))}_{round(44*number($OSD_SIZE_))}.png" osd_configuration="1"/> + <osd type="navigation_next_turn" x="0" y="{round(-60*number($OSD_SIZE_)*number($OSD_FACTOR_))}" w="{round(60*number($OSD_SIZE_)*number($OSD_FACTOR_))}" h="{round(40*number($OSD_SIZE_)*number($OSD_FACTOR_))}" icon_src="%s_wh_{round(44*number($OSD_SIZE_))}_{round(44*number($OSD_SIZE_))}.png" osd_configuration="1"/> <xsl:text>
 </xsl:text> <osd type="text" label="${{navigation.item[1].length[named]}}" x="0" y="{round(-20*number($OSD_SIZE_))}" w="{round(60*number($OSD_SIZE_))}" h="{round(20*number($OSD_SIZE_))}" font_size="{round(200*number($OSD_SIZE_))}" osd_configuration="1"/> <xsl:text>
 </xsl:text> |