summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormvglasow <michael -at- vonglasow.com>2019-01-24 17:47:39 +0100
committermvglasow <michael -at- vonglasow.com>2019-01-24 17:47:39 +0100
commitd09fb4bc5b5018774b7a66baebd7dec82738923e (patch)
treef80b1c8e924f9b33b56140cad47fa0575b088aec
parent33da9ddbba408d1f11b54fcbd1330780d2055518 (diff)
downloadnavit-d09fb4bc5b5018774b7a66baebd7dec82738923e.tar.gz
Add:gui:Rearrange buttons to fit on a 240×240 screen
Signed-off-by: mvglasow <michael -at- vonglasow.com>
-rw-r--r--navit/xslt/osd_minimum.xslt12
1 files changed, 6 insertions, 6 deletions
diff --git a/navit/xslt/osd_minimum.xslt b/navit/xslt/osd_minimum.xslt
index 275e9aff7..c516e917c 100644
--- a/navit/xslt/osd_minimum.xslt
+++ b/navit/xslt/osd_minimum.xslt
@@ -21,17 +21,17 @@
<xsl:text>&#x0A; </xsl:text>
<osd type="text" label="${{tracking.item.street_name_systematic}}${{tracking.item.street_name}}" x="0" y="{round(-14*number($OSD_SIZE))}" w="100%" h="{round(14*number($OSD_SIZE))}" font_size="{round(200*number($OSD_SIZE))}" enable_expression="vehicle.position_valid"/>
<xsl:text>&#x0A; </xsl:text>
- <osd type="toggle_announcer" icon_src="%s_{number($ICON_BIG)}_{number($ICON_BIG)}.png" x="{round(8*number($OSD_SIZE))}" y="{round(-(number($ICON_BIG)+8*number($OSD_SIZE))-14*number($OSD_SIZE))}" w="{round(number($ICON_BIG))}" h="{round(number($ICON_BIG))}"/>
+ <osd type="toggle_announcer" icon_src="%s_{number($ICON_BIG)}_{number($ICON_BIG)}.png" x="{round(-(number($ICON_BIG)+8*number($OSD_SIZE)))}" y="{round(-(number($ICON_BIG)+8*number($OSD_SIZE))-94*number($OSD_SIZE))}" w="{round(number($ICON_BIG))}" h="{round(number($ICON_BIG))}"/>
<xsl:text>&#x0A; </xsl:text>
- <osd type="button" src="zoom_manual_{number($ICON_BIG)}_{number($ICON_BIG)}.png" command="autozoom_active=0" x="{round(-(number($ICON_BIG)+8*number($OSD_SIZE))-60*number($OSD_SIZE))}" y="{-round(number($ICON_BIG)+22*number($OSD_SIZE))}" osd_configuration="1" use_overlay="{$OSD_USE_OVERLAY}" enable_expression="autozoom_active!=0"/>
+ <osd type="button" src="zoom_manual_{number($ICON_BIG)}_{number($ICON_BIG)}.png" command="autozoom_active=0" x="{round(8*number($OSD_SIZE))}" y="{-round(number($ICON_BIG)+22*number($OSD_SIZE))}" osd_configuration="1" use_overlay="{$OSD_USE_OVERLAY}" enable_expression="autozoom_active!=0"/>
<xsl:text>&#x0A; </xsl:text>
- <osd type="button" src="zoom_auto_{number($ICON_BIG)}_{number($ICON_BIG)}.png" command="autozoom_active=1" x="{round(-(number($ICON_BIG)+8*number($OSD_SIZE))-60*number($OSD_SIZE))}" y="{-round(number($ICON_BIG)+22*number($OSD_SIZE))}" osd_configuration="1" use_overlay="{$OSD_USE_OVERLAY}" enable_expression="autozoom_active==0"/>
+ <osd type="button" src="zoom_auto_{number($ICON_BIG)}_{number($ICON_BIG)}.png" command="autozoom_active=1" x="{round(8*number($OSD_SIZE))}" y="{-round(number($ICON_BIG)+22*number($OSD_SIZE))}" osd_configuration="1" use_overlay="{$OSD_USE_OVERLAY}" enable_expression="autozoom_active==0"/>
<xsl:text>&#x0A; </xsl:text>
- <osd type="button" src="zoom_in_{number($ICON_BIG)}_{number($ICON_BIG)}.png" command="zoom_in()" x="{round(-3*(number($ICON_BIG)+8*number($OSD_SIZE))-60*number($OSD_SIZE))}" y="{-round(number($ICON_BIG)+22*number($OSD_SIZE))}" osd_configuration="1" use_overlay="{$OSD_USE_OVERLAY}"/>
+ <osd type="button" src="zoom_in_{number($ICON_BIG)}_{number($ICON_BIG)}.png" command="zoom_in()" x="{round((number($ICON_BIG)+8*number($OSD_SIZE))+8*number($OSD_SIZE))}" y="{-round(number($ICON_BIG)+22*number($OSD_SIZE))}" osd_configuration="1" use_overlay="{$OSD_USE_OVERLAY}"/>
<xsl:text>&#x0A; </xsl:text>
- <osd type="button" src="zoom_out_{number($ICON_BIG)}_{number($ICON_BIG)}.png" command="zoom_out()" x="{round(-2*(number($ICON_BIG)+8*number($OSD_SIZE))-60*number($OSD_SIZE))}" y="{-round(number($ICON_BIG)+22*number($OSD_SIZE))}" osd_configuration="1" use_overlay="{$OSD_USE_OVERLAY}"/>
+ <osd type="button" src="zoom_out_{number($ICON_BIG)}_{number($ICON_BIG)}.png" command="zoom_out()" x="{round(2*(number($ICON_BIG)+8*number($OSD_SIZE))+8*number($OSD_SIZE))}" y="{-round(number($ICON_BIG)+22*number($OSD_SIZE))}" osd_configuration="1" use_overlay="{$OSD_USE_OVERLAY}"/>
<xsl:text>&#x0A; </xsl:text>
- <osd type="button" src="follow_{number($ICON_BIG)}_{number($ICON_BIG)}.png" command="follow=0;set_center_cursor()" x="{round(-(number($ICON_BIG)+8*number($OSD_SIZE)))}" y="{round(-(number($ICON_BIG)+8*number($OSD_SIZE))-94*number($OSD_SIZE))}" enable_expression="follow>1" use_overlay="{$OSD_USE_OVERLAY}"/>
+ <osd type="button" src="follow_{number($ICON_BIG)}_{number($ICON_BIG)}.png" command="follow=0;set_center_cursor()" x="{$NEXT_TURN_SIZE+$NEXT_TURN_TEXT_HIGHT+round(8*number($OSD_SIZE))}" y="{round(22*number($OSD_SIZE))}" enable_expression="follow>1" use_overlay="{$OSD_USE_OVERLAY}"/>
<xsl:text>&#x0A; </xsl:text>
<osd type="cmd_interface" update_period="1" command="pitch=autozoom_active==0?pitch:(follow>1?0:20);orientation=autozoom_active==0?orientation:(follow>1?0:-1)" x="-1" y="-1" w="1" h="1"/>
<xsl:text>&#x0A; </xsl:text>