From: <mar...@us...> - 2009-08-31 17:31:43
|
Revision: 2539 http://navit.svn.sourceforge.net/navit/?rev=2539&view=rev Author: martin-s Date: 2009-08-31 17:31:31 +0000 (Mon, 31 Aug 2009) Log Message: ----------- Fix:xslt:Bigger OSDs for android Modified Paths: -------------- trunk/navit/navit/xslt/android.xslt trunk/navit/navit/xslt/osd_minimum.xslt Modified: trunk/navit/navit/xslt/android.xslt =================================================================== --- trunk/navit/navit/xslt/android.xslt 2009-08-31 17:14:42 UTC (rev 2538) +++ trunk/navit/navit/xslt/android.xslt 2009-08-31 17:31:31 UTC (rev 2539) @@ -1,6 +1,7 @@ <?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:output method="xml" doctype-system="navit.dtd" /> + <xsl:variable name="OSD_SIZE">1.33</xsl:variable> <xsl:include href="default_plugins.xslt"/> <xsl:include href="gui_internal.xslt"/> <xsl:include href="map_sdcard_navitmap_bin.xslt"/> Modified: trunk/navit/navit/xslt/osd_minimum.xslt =================================================================== --- trunk/navit/navit/xslt/osd_minimum.xslt 2009-08-31 17:14:42 UTC (rev 2538) +++ trunk/navit/navit/xslt/osd_minimum.xslt 2009-08-31 17:31:31 UTC (rev 2539) @@ -1,17 +1,23 @@ <?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:variable name="OSD_SIZE_"> + <xsl:choose> + <xsl:when test="string-length($OSD_SIZE)"><xsl:value-of select="$OSD_SIZE"/></xsl:when> + <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_))}"/> <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"/> + <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_))}"/> <xsl:text>
 </xsl:text> - <osd type="navigation_next_turn" x="0" y="-60" w="60" h="40" icon_src="%s_wh_44_44.png"/> + <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"/> <xsl:text>
 </xsl:text> - <osd type="text" label="${{navigation.item[1].length[named]}}" x="0" y="-20"/> + <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_))}"/> <xsl:text>
 </xsl:text> - <osd type="button" src="gui_zoom_in_64_64.png" command="zoom_in()" x="0" y="0"/> + <osd type="button" src="gui_zoom_in_{round(48*number($OSD_SIZE_))}_{round(48*number($OSD_SIZE_))}.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"/> + <osd type="button" src="gui_zoom_out_{round(48*number($OSD_SIZE_))}_{round(48*number($OSD_SIZE_))}.png" command="zoom_out()" x="0" y="{round(53*number($OSD_SIZE_))}"/> <xsl:text>
 </xsl:text> <xsl:copy><xsl:copy-of select="@*|node()"/></xsl:copy> </xsl:template> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |