diff options
| -rw-r--r-- | navit/navit_shipped.xml | 82 | ||||
| -rw-r--r-- | navit/xpm/Makefile.am | 9 | ||||
| -rw-r--r-- | navit/xpm/menu.svg | 103 | ||||
| -rw-r--r-- | navit/xpm/toggle_fullscreen.svg | 86 |
4 files changed, 236 insertions, 44 deletions
diff --git a/navit/navit_shipped.xml b/navit/navit_shipped.xml index 37ed773f7..920e8ecab 100644 --- a/navit/navit_shipped.xml +++ b/navit/navit_shipped.xml @@ -102,8 +102,8 @@ Navigation</text></img> <!-- Commands include gui_internal_menu, gui_internal_fullscreen, zoom_in and zoom_out. Usage of negative values change the button origins. x="0" y="0" specifies the top left, x="-0" y="-0" the bottom right corner. It's always the top left corner of the icon, so you need to consider the icon's size when you enter the values. --> - <osd enabled="no" type="button" x="0" y="0" command="gui.fullscreen=!gui.fullscreen" src="toggle_fullscreen.xpm"/> - <osd enabled="no" type="button" x="-96" y="0" command="gui.menu(1)" src="menu.xpm"/> + <osd enabled="no" type="button" x="0" y="0" command="gui.fullscreen=!gui.fullscreen" src="toggle_fullscreen.png"/> + <osd enabled="no" type="button" x="-96" y="0" command="gui.menu(1)" src="menu.png"/> <osd enabled="no" type="button" x="-96" y="-96" command="zoom_in()" src="zoom_in.png"/> <osd enabled="no" type="button" x="0" y="-96" command="zoom_out()" src="zoom_out.png"/> @@ -1790,10 +1790,10 @@ Navigation</text></img> </layer> <layer name="POI Symbols"> <itemgra item_types="mini_roundabout" order="12-"> - <icon src="mini_roundabout.xpm"/> + <icon src="mini_roundabout.png"/> </itemgra> <itemgra item_types="turning_circle" order="12-"> - <icon src="mini_roundabout.xpm"/> + <icon src="mini_roundabout.png"/> </itemgra> <itemgra item_types="poi_airport" order="5-"> <icon src="airport.png"/> @@ -1889,13 +1889,13 @@ Navigation</text></img> <icon src="bussines_service.xpm"/> </itemgra> <itemgra item_types="poi_car_rent" order="12-"> - <icon src="car_rent.xpm"/> + <icon src="car_rent.png"/> </itemgra> <itemgra item_types="poi_car_wash" order="12-"> <icon src="car_wash.xpm"/> </itemgra> <itemgra item_types="poi_casino" order="12-"> - <icon src="casino.xpm"/> + <icon src="casino.png"/> </itemgra> <itemgra item_types="poi_cemetery" order="12-"> <icon src="cemetery.xpm"/> @@ -1919,7 +1919,7 @@ Navigation</text></img> <icon src="crossing.xpm"/> </itemgra> <itemgra item_types="poi_dam" order="12-"> - <icon src="dam.xpm"/> + <icon src="dam.png"/> </itemgra> <itemgra item_types="poi_danger_area" order="12-"> <icon src="danger_16_16.png"/> @@ -1928,16 +1928,16 @@ Navigation</text></img> <icon src="dangerous.xpm"/> </itemgra> <itemgra item_types="poi_daymark" order="12-"> - <icon src="daymark.xpm"/> + <icon src="daymark.png"/> </itemgra> <itemgra item_types="poi_diving" order="12-"> <icon src="diving.xpm"/> </itemgra> <itemgra item_types="poi_drinking_water" order="13-"> - <icon src="drinking_water.xpm"/> + <icon src="drinking_water.png"/> </itemgra> <itemgra item_types="poi_emergency" order="12-"> - <icon src="emergency.xpm"/> + <icon src="emergency.png"/> </itemgra> <itemgra item_types="poi_fair" order="12-"> <icon src="fair.xpm"/> @@ -1973,7 +1973,7 @@ Navigation</text></img> <icon src="icesport.xpm"/> </itemgra> <itemgra item_types="poi_information" order="12-"> - <icon src="information.xpm"/> + <icon src="information.png"/> </itemgra> <itemgra item_types="poi_justice" order="12-"> <icon src="justice.png"/> @@ -2009,7 +2009,7 @@ Navigation</text></img> <icon src="marine_type.xpm"/> </itemgra> <itemgra item_types="poi_mark" order="12-"> - <icon src="mark.xpm"/> + <icon src="mark.png"/> </itemgra> <itemgra item_types="poi_military" order="11-"> <icon src="military.png"/> @@ -2075,19 +2075,19 @@ Navigation</text></img> <icon src="scenic_area.xpm"/> </itemgra> <itemgra item_types="poi_school" order="12-"> - <icon src="school.xpm"/> + <icon src="school.png"/> </itemgra> <itemgra item_types="poi_service" order="12-"> <icon src="service.xpm"/> </itemgra> <itemgra item_types="poi_shop_apparel" order="12-"> - <icon src="shop_apparel.xpm"/> + <icon src="shop_apparel.png"/> </itemgra> <itemgra item_types="poi_shop_computer" order="12-"> - <icon src="shop_computer.xpm"/> + <icon src="shop_computer.png"/> </itemgra> <itemgra item_types="poi_shop_department" order="12-"> - <icon src="shop_department.xpm"/> + <icon src="shop_department.png"/> </itemgra> <itemgra item_types="poi_shop_furniture" order="12-"> <icon src="shop_furnish.xpm"/> @@ -2120,13 +2120,13 @@ Navigation</text></img> <icon src="sport.xpm"/> </itemgra> <itemgra item_types="poi_stadium" order="11-"> - <icon src="stadium.xpm"/> + <icon src="stadium.png"/> </itemgra> <itemgra item_types="poi_swimming" order="12-"> <icon src="swimming.png"/> </itemgra> <itemgra item_types="poi_telephone" order="13-"> - <icon src="telephone.xpm"/> + <icon src="telephone.png"/> </itemgra> <itemgra item_types="poi_theater" order="12-"> <icon src="theater.xpm"/> @@ -2153,7 +2153,7 @@ Navigation</text></img> <icon src="wine.xpm"/> </itemgra> <itemgra item_types="poi_worship" order="8-"> - <icon src="worship.xpm"/> + <icon src="worship.png"/> </itemgra> <itemgra item_types="poi_wrecker" order="12-"> <icon src="wrecker.xpm"/> @@ -3159,10 +3159,10 @@ Navigation</text></img> </layer> <layer name="points"> <itemgra item_types="mini_roundabout" order="12-"> - <icon src="mini_roundabout.xpm"/> + <icon src="mini_roundabout.png"/> </itemgra> <itemgra item_types="turning_circle" order="12-"> - <icon src="mini_roundabout.xpm"/> + <icon src="mini_roundabout.png"/> </itemgra> <itemgra item_types="poi_airport" order="5-"> <icon src="airport.png"/> @@ -3174,7 +3174,7 @@ Navigation</text></img> <icon src="hotel.png"/> </itemgra> <itemgra item_types="poi_car_parking" order="11-"> - <icon src="parking.xpm"/> + <icon src="parking.png"/> </itemgra> <itemgra item_types="poi_car_dealer_parts" order="0-"> <icon src="car_dealer.xpm"/> @@ -3204,10 +3204,10 @@ Navigation</text></img> <icon src="exit.png"/> </itemgra> <itemgra item_types="poi_camp_rv" order="9-"> - <icon src="camping.xpm"/> + <icon src="camping.png"/> </itemgra> <itemgra item_types="poi_museum_history" order="12-"> - <icon src="museum.xpm"/> + <icon src="museum.png"/> </itemgra> <itemgra item_types="poi_hospital" order="12-"> <icon src="hospital.png"/> @@ -3264,13 +3264,13 @@ Navigation</text></img> <icon src="bussines_service.xpm"/> </itemgra> <itemgra item_types="poi_car_rent" order="11-"> - <icon src="car_rent.xpm"/> + <icon src="car_rent.png"/> </itemgra> <itemgra item_types="poi_car_wash" order="12-"> <icon src="car_wash.xpm"/> </itemgra> <itemgra item_types="poi_casino" order="11-"> - <icon src="casino.xpm"/> + <icon src="casino.png"/> </itemgra> <itemgra item_types="poi_cemetery" order="11-"> <icon src="cemetery.xpm"/> @@ -3294,7 +3294,7 @@ Navigation</text></img> <icon src="crossing.xpm"/> </itemgra> <itemgra item_types="poi_dam" order="0-"> - <icon src="dam.xpm"/> + <icon src="dam.png"/> </itemgra> <itemgra item_types="poi_danger_area" order="12-"> <icon src="danger_16_16.png"/> @@ -3303,16 +3303,16 @@ Navigation</text></img> <icon src="dangerous.xpm"/> </itemgra> <itemgra item_types="poi_daymark" order="0-"> - <icon src="daymark.xpm"/> + <icon src="daymark.png"/> </itemgra> <itemgra item_types="poi_diving" order="0-"> <icon src="diving.xpm"/> </itemgra> <itemgra item_types="poi_drinking_water" order="0-"> - <icon src="drinking_water.xpm"/> + <icon src="drinking_water.png"/> </itemgra> <itemgra item_types="poi_emergency" order="0-"> - <icon src="emergency.xpm"/> + <icon src="emergency.png"/> </itemgra> <itemgra item_types="poi_fair" order="0-"> <icon src="fair.xpm"/> @@ -3348,13 +3348,13 @@ Navigation</text></img> <icon src="icesport.xpm"/> </itemgra> <itemgra item_types="poi_information" order="12-"> - <icon src="information.xpm"/> + <icon src="information.png"/> </itemgra> <itemgra item_types="poi_justice" order="10-"> <icon src="justice.png"/> </itemgra> <itemgra item_types="poi_landmark" order="0-"> - <icon src="landmark.xpm"/> + <icon src="landmark.png"/> </itemgra> <itemgra item_types="poi_levee" order="0-"> <icon src="levee.xpm"/> @@ -3384,7 +3384,7 @@ Navigation</text></img> <icon src="marine_type.xpm"/> </itemgra> <itemgra item_types="poi_mark" order="0-"> - <icon src="mark.xpm"/> + <icon src="mark.png"/> </itemgra> <itemgra item_types="poi_military" order="0-"> <icon src="military.png"/> @@ -3435,7 +3435,7 @@ Navigation</text></img> <icon src="resort.png"/> </itemgra> <itemgra item_types="poi_restaurant" order="12-"> - <icon src="restaurant.xpm"/> + <icon src="restaurant.png"/> </itemgra> <itemgra item_types="poi_restricted_area" order="0-"> <icon src="restricted_area.xpm"/> @@ -3450,19 +3450,19 @@ Navigation</text></img> <icon src="scenic_area.xpm"/> </itemgra> <itemgra item_types="poi_school" order="12-"> - <icon src="school.xpm"/> + <icon src="school.png"/> </itemgra> <itemgra item_types="poi_service" order="0-"> <icon src="service.xpm"/> </itemgra> <itemgra item_types="poi_shop_apparel" order="0-"> - <icon src="shop_apparel.xpm"/> + <icon src="shop_apparel.png"/> </itemgra> <itemgra item_types="poi_shop_computer" order="0-"> - <icon src="shop_computer.xpm"/> + <icon src="shop_computer.png"/> </itemgra> <itemgra item_types="poi_shop_department" order="0-"> - <icon src="shop_department.xpm"/> + <icon src="shop_department.png"/> </itemgra> <itemgra item_types="poi_shop_furniture" order="0-"> <icon src="shop_furnish.xpm"/> @@ -3495,7 +3495,7 @@ Navigation</text></img> <icon src="sport.xpm"/> </itemgra> <itemgra item_types="poi_stadium" order="0-"> - <icon src="stadium.xpm"/> + <icon src="stadium.png"/> </itemgra> <itemgra item_types="poi_swimming" order="12-"> <icon src="swimming.png"/> @@ -3531,7 +3531,7 @@ Navigation</text></img> <icon src="wine.xpm"/> </itemgra> <itemgra item_types="poi_worship" order="0-"> - <icon src="worship.xpm"/> + <icon src="worship.png"/> </itemgra> <itemgra item_types="poi_wrecker" order="0-"> <icon src="wrecker.xpm"/> @@ -6540,7 +6540,7 @@ Navigation</text></img> </itemgra> <!-- tourism=hotel --> <itemgra item_types="poi_hotel" order="14-"> - <icon src="hotel.xpm"/> + <icon src="hotel.png"/> <circle color="#000000" radius="3" text_size="7"/> </itemgra> </layer> diff --git a/navit/xpm/Makefile.am b/navit/xpm/Makefile.am index b63f955d0..7645ff3c6 100644 --- a/navit/xpm/Makefile.am +++ b/navit/xpm/Makefile.am @@ -25,6 +25,10 @@ image_DATA += public_office.xpm image_DATA += biergarten.xpm image_DATA += restroom.xpm +xpm_DATA += biergarten.xpm +xpm_DATA += restroom.xpm +xpm_DATA += menu.xpm +xpm_DATA += toggle_fullscreen.xpm ## Obsolete end @@ -54,9 +58,6 @@ image_DATA += nav_left_2_32.xpm image_DATA += nav_right_1_32.xpm image_DATA += nav_right_2_32.xpm -image_DATA += menu.xpm -image_DATA += toggle_fullscreen.xpm - svgs = gui_about.svg svgs += gui_actions.svg svgs += gui_active.svg @@ -102,6 +103,8 @@ svgs += gui_minus.svg svgs += gui_plus.svg svgs += gui_log.svg svgs += gui_search.svg +svgs += menu.svg +svgs += toggle_fullscreen.svg svgs += airport.svg svgs += attraction.svg diff --git a/navit/xpm/menu.svg b/navit/xpm/menu.svg new file mode 100644 index 000000000..ae79e781a --- /dev/null +++ b/navit/xpm/menu.svg @@ -0,0 +1,103 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="svg2933" + version="1.1" + inkscape:version="0.47 r22583" + width="96" + height="96" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + sodipodi:docname="osd_menu.svg" + style="display:inline"> + <metadata + id="metadata2939"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs2937"> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 0.5 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="1 : 0.5 : 1" + inkscape:persp3d-origin="0.5 : 0.33333333 : 1" + id="perspective2941" /> + <inkscape:perspective + id="perspective4247" + inkscape:persp3d-origin="0.5 : 0.33333333 : 1" + inkscape:vp_z="1 : 0.5 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_x="0 : 0.5 : 1" + sodipodi:type="inkscape:persp3d" /> + <inkscape:perspective + id="perspective4331" + inkscape:persp3d-origin="0.5 : 0.33333333 : 1" + inkscape:vp_z="1 : 0.5 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_x="0 : 0.5 : 1" + sodipodi:type="inkscape:persp3d" /> + <inkscape:perspective + id="perspective4353" + inkscape:persp3d-origin="0.5 : 0.33333333 : 1" + inkscape:vp_z="1 : 0.5 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_x="0 : 0.5 : 1" + sodipodi:type="inkscape:persp3d" /> + </defs> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1365" + inkscape:window-height="918" + id="namedview2935" + showgrid="false" + inkscape:zoom="10.665578" + inkscape:cx="46.462249" + inkscape:cy="46.58232" + inkscape:window-x="310" + inkscape:window-y="46" + inkscape:window-maximized="0" + inkscape:current-layer="layer1" /> + <g + inkscape:groupmode="layer" + id="layer1" + inkscape:label="svg" + style="display:inline"> + <g + id="g4367"> + <path + sodipodi:nodetypes="ccc" + id="path3465-0" + d="m 68.424793,50.800443 -17.366603,-0.0542 -0.0396,17.427024" + style="fill:none;stroke:#808080;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + <path + sodipodi:nodetypes="ccc" + id="path3465-8-0" + d="m 27.576326,44.752825 17.497596,-0.0132 0.03734,-17.394221" + style="fill:none;stroke:#808080;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + </g> + </g> +</svg> diff --git a/navit/xpm/toggle_fullscreen.svg b/navit/xpm/toggle_fullscreen.svg new file mode 100644 index 000000000..0d64d21d1 --- /dev/null +++ b/navit/xpm/toggle_fullscreen.svg @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="svg2933" + version="1.1" + inkscape:version="0.47 r22583" + width="96" + height="96" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + sodipodi:docname="osd_fullscreen.svg" + style="display:inline"> + <metadata + id="metadata2939"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs2937"> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 0.5 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="1 : 0.5 : 1" + inkscape:persp3d-origin="0.5 : 0.33333333 : 1" + id="perspective2941" /> + <inkscape:perspective + id="perspective4247" + inkscape:persp3d-origin="0.5 : 0.33333333 : 1" + inkscape:vp_z="1 : 0.5 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_x="0 : 0.5 : 1" + sodipodi:type="inkscape:persp3d" /> + </defs> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1450" + inkscape:window-height="991" + id="namedview2935" + showgrid="false" + inkscape:zoom="7.6354167" + inkscape:cx="48" + inkscape:cy="48" + inkscape:window-x="310" + inkscape:window-y="46" + inkscape:window-maximized="0" + inkscape:current-layer="layer1" /> + <g + inkscape:groupmode="layer" + id="layer1" + inkscape:label="svg" + style="display:inline"> + <path + style="fill:none;stroke:#808080;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + d="m 44.404449,27.021404 -17.366603,-0.0542 -0.0396,17.427024" + id="path3465" + sodipodi:nodetypes="ccc" /> + <path + style="fill:none;stroke:#808080;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + d="m 51.494316,69.020405 17.497596,-0.0132 0.03734,-17.394221" + id="path3465-8" + sodipodi:nodetypes="ccc" /> + </g> +</svg> |
