Adding tomtom assets

4 files changed, 72 insertions, 63 deletions

diff --git a/ci/build_tomtom_plugin.sh b/ci/build_tomtom_plugin.sh
index 2b404d73b..f55a3d002 100644
--- a/ci/build_tomtom_plugin.sh
+++ b/ci/build_tomtom_plugin.sh
@@ -100,69 +100,7 @@ cp $PREFIX/usr/bin/testvidinfo $OUT_PATH/navit/sdl
 
 # navit executable and wrapper
 cp $PREFIX/bin/navit $OUT_PATH/navit/bin
-cat > $OUT_PATH/navit/bin/navit-wrapper << 'EOF'
-#!/bin/sh
-
-cd /mnt/sdcard/navit/bin
-
-# Set some paths.
-export PATH=$PATH:/mnt/sdcard/navit/bin
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/mnt/sdcard/navit/lib:/mnt/sdcard/LoquendoTTS/lib
-export HOME=/mnt/sdcard/navit
-export NAVIT_LIBDIR=/mnt/sdcard/navit/lib/navit
-export NAVIT_SHAREDIR=/mnt/sdcard/navit/share
-export NAVIT_LOCALEDIR=/mnt/sdcard/navit/share/locale
-
-# tslib requirements.
-export TSLIB_CONSOLEDEVICE=none
-export TSLIB_FBDEVICE=/dev/fb
-export TSLIB_TSDEVICE=/dev/ts
-export TSLIB_CALIBFILE=/mnt/sdcard/navit/ts/pointercal
-export TSLIB_CONFFILE=/mnt/sdcard/navit/ts/ts.conf
-export TSLIB_PLUGINDIR=/mnt/sdcard/navit/lib/ts
-
-# SDL requirements.
-export SDL_MOUSEDRV=TSLIB
-export SDL_MOUSEDEV=$TSLIB_TSDEVICE
-export SDL_NOMOUSE=1
-export SDL_FBDEV=/dev/fb
-export SDL_VIDEODRIVER=fbcon
-export SDL_AUDIODRIVER=dsp
-
-# Set time zone.
-export TZ="CEDT-01:00:00CEST-02:00:00,M3.4.0,M10.4.0"
-
-# Set language.
-export LANG=en_US
-
-export ESPEAK_DATA_PATH=/mnt/sdcard/navit/share
-
-# Run Navit.
-if /mnt/sdcard/navit/sdl/testvidinfo | grep 480x272
-then
-	/mnt/sdcard/navit/bin/navit /mnt/sdcard/navit/share/tomtom480.xml 2>/mnt/sdcard/navit/navit.log&
-# tomtom320xml is not provided yet
-# elif  /mnt/sdcard/navit/sdl/testvidinfo | grep 320x240
-# then
-# 	/mnt/sdcard/navit/bin/navit /mnt/sdcard/navit/share/config/tomtom320.xml 2>/mnt/sdcard/navit/navit.log&
-else
-	exit 1
-fi
-
-# Kill TTN while Navit is running.
-killall ttn
-
-while [ $? -eq 0 ]
-do
-echo "\0" > /dev/watchdog
-sleep 10
-ps | grep -v grep | grep -v wrapper | grep navit
-done
-
-/sbin/reboot
-
-EOF
-chmod a+rx bin/navit-wrapper
+cp contrib/tomtom/navit-wrapper $OUT_PATH/navit/bin/navit-wrapper 
 
 # fonts
 cp -r ../navit/fonts/*.ttf $OUT_PATH/navit/share/fonts
diff --git a/contrib/tomtom/navit-wrapper b/contrib/tomtom/navit-wrapper
new file mode 100755
index 000000000..f4eadb9e0
--- /dev/null
+++ b/contrib/tomtom/navit-wrapper
@@ -0,0 +1,59 @@
+#!/bin/sh
+
+cd /mnt/sdcard/navit/bin
+
+# Set some paths.
+export PATH=$PATH:/mnt/sdcard/navit/bin
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/mnt/sdcard/navit/lib:/mnt/sdcard/LoquendoTTS/lib
+export HOME=/mnt/sdcard/navit
+export NAVIT_LIBDIR=/mnt/sdcard/navit/lib/navit
+export NAVIT_SHAREDIR=/mnt/sdcard/navit/share
+export NAVIT_LOCALEDIR=/mnt/sdcard/navit/share/locale
+
+# tslib requirements.
+export TSLIB_CONSOLEDEVICE=none
+export TSLIB_FBDEVICE=/dev/fb
+export TSLIB_TSDEVICE=/dev/ts
+export TSLIB_CALIBFILE=/mnt/sdcard/navit/ts/pointercal
+export TSLIB_CONFFILE=/mnt/sdcard/navit/ts/ts.conf
+export TSLIB_PLUGINDIR=/mnt/sdcard/navit/lib/ts
+
+# SDL requirements.
+export SDL_MOUSEDRV=TSLIB
+export SDL_MOUSEDEV=$TSLIB_TSDEVICE
+export SDL_NOMOUSE=1
+export SDL_FBDEV=/dev/fb
+export SDL_VIDEODRIVER=fbcon
+export SDL_AUDIODRIVER=dsp
+
+# Set time zone.
+export TZ="CEDT-01:00:00CEST-02:00:00,M3.4.0,M10.4.0"
+
+# Set language.
+export LANG=en_US
+
+export ESPEAK_DATA_PATH=/mnt/sdcard/navit/share
+
+# Run Navit.
+if /mnt/sdcard/navit/sdl/testvidinfo | grep 480x272
+then
+        /mnt/sdcard/navit/bin/navit /mnt/sdcard/navit/share/tomtom480.xml 2>/mnt/sdcard/navit/navit.log&
+# tomtom320xml is not provided yet
+# elif  /mnt/sdcard/navit/sdl/testvidinfo | grep 320x240
+# then
+#       /mnt/sdcard/navit/bin/navit /mnt/sdcard/navit/share/config/tomtom320.xml 2>/mnt/sdcard/navit/navit.log&
+else
+        exit 1
+fi
+
+# Kill TTN while Navit is running.
+killall ttn
+
+while [ $? -eq 0 ]
+do
+echo "\0" > /dev/watchdog
+sleep 10
+ps | grep -v grep | grep -v wrapper | grep navit
+done
+
+/sbin/reboot
diff --git a/navit/icons/tomtom_minus.svg b/navit/icons/tomtom_minus.svg
new file mode 100644
index 000000000..9453d687d
--- /dev/null
+++ b/navit/icons/tomtom_minus.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="64px" height="64px" viewBox="-100 -100 200 200" xmlns="http://www.w3.org/2000/svg" version="1.1">
+<rect x="-110" y="-110" width="220" height="220" fill="#000080" stroke="none" opacity="0.5"/>
+<path fill="none" stroke="#ffffff" stroke-width="20" stroke-linecap="round" d="M 60 0 L -60 0"/>
+</svg>
diff --git a/navit/icons/tomtom_plus.svg b/navit/icons/tomtom_plus.svg
new file mode 100644
index 000000000..bdf74c4f4
--- /dev/null
+++ b/navit/icons/tomtom_plus.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="64px" height="64px" viewBox="-100 -100 200 200" xmlns="http://www.w3.org/2000/svg" version="1.1">
+<rect x="-110" y="-110" width="220" height="220" fill="#000080" stroke="none" opacity="0.5"/>
+<path fill="none" stroke="#ffffff" stroke-width="20" stroke-linecap="round" d="M 0 60 L 0 -60 M 60 0 L -60 0"/>
+</svg>