From 5ef0d0aafd919cb5cca53b749ce27a8259da676a Mon Sep 17 00:00:00 2001 From: woglinde Date: Sat, 4 Jun 2011 17:52:43 +0000 Subject: [PATCH] Add:xpm:Add some more svgs, patch is provided by themroc and was slightly modified(bar.svg is needed), new svgs comes from openclipart.org, closes ticker #861 git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4509 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- navit/navit/navit_shipped.xml | 52 +-- navit/navit/xpm/Makefile.am | 97 +++-- navit/navit/xpm/beer.svg | 139 +++++++ navit/navit/xpm/bench.svg | 469 ++++++++++++++++++++++ navit/navit/xpm/boundary_stone.svg | 320 +++++++++++++++ navit/navit/xpm/fountain.svg | 452 +++++++++++++++++++++ navit/navit/xpm/golf.svg | 186 +++++++++ navit/navit/xpm/justice.svg | 144 +++++++ navit/navit/xpm/military.svg | 310 ++++++++++++++ navit/navit/xpm/ruins.svg | 801 +++++++++++++++++++++++++++++++++++++ navit/navit/xpm/skiing.svg | 332 +++++++++++++++ navit/navit/xpm/swimming.svg | 335 ++++++++++++++++ navit/navit/xpm/toilets.svg | 129 ++++++ navit/navit/xpm/wifi.svg | 127 ++++++ 14 files changed, 3835 insertions(+), 58 deletions(-) create mode 100644 navit/navit/xpm/beer.svg create mode 100644 navit/navit/xpm/bench.svg create mode 100644 navit/navit/xpm/boundary_stone.svg create mode 100644 navit/navit/xpm/fountain.svg create mode 100644 navit/navit/xpm/golf.svg create mode 100644 navit/navit/xpm/justice.svg create mode 100644 navit/navit/xpm/military.svg create mode 100644 navit/navit/xpm/ruins.svg create mode 100644 navit/navit/xpm/skiing.svg create mode 100644 navit/navit/xpm/swimming.svg create mode 100644 navit/navit/xpm/toilets.svg create mode 100644 navit/navit/xpm/wifi.svg diff --git a/navit/navit/navit_shipped.xml b/navit/navit/navit_shipped.xml index 4dfac0d..3716f1c 100644 --- a/navit/navit/navit_shipped.xml +++ b/navit/navit/navit_shipped.xml @@ -1809,7 +1809,7 @@ Navigation - + @@ -1830,7 +1830,7 @@ Navigation - + @@ -1866,7 +1866,7 @@ Navigation - + @@ -1920,7 +1920,7 @@ Navigation - + @@ -1962,7 +1962,7 @@ Navigation - + @@ -1977,7 +1977,7 @@ Navigation - + @@ -2046,26 +2046,26 @@ Navigation - + - + - + - + - + @@ -2080,13 +2080,13 @@ Navigation - + - + @@ -3170,7 +3170,7 @@ Navigation - + @@ -3191,7 +3191,7 @@ Navigation - + @@ -3227,7 +3227,7 @@ Navigation - + @@ -3281,7 +3281,7 @@ Navigation - + @@ -3323,7 +3323,7 @@ Navigation - + @@ -3338,7 +3338,7 @@ Navigation - + @@ -3365,7 +3365,7 @@ Navigation - + @@ -3414,13 +3414,13 @@ Navigation - + - + - + @@ -3438,13 +3438,13 @@ Navigation - + - + @@ -6339,7 +6339,7 @@ Navigation - + diff --git a/navit/navit/xpm/Makefile.am b/navit/navit/xpm/Makefile.am index 4dd5507..8751ba9 100644 --- a/navit/navit/xpm/Makefile.am +++ b/navit/navit/xpm/Makefile.am @@ -1,54 +1,73 @@ include $(top_srcdir)/Makefile.inc -xpm_DATA = bench.xpm -xpm_DATA += biergarten.xpm -xpm_DATA += boundary_stone.xpm -xpm_DATA += bus_halt.xpm +xpm_DATA = bus_halt.xpm xpm_DATA += car_dealer.xpm xpm_DATA += castle.xpm -xpm_DATA += ruins.xpm xpm_DATA += cemetery.xpm xpm_DATA += dumping_station.xpm -xpm_DATA += fountain.xpm -xpm_DATA += flag_bk_tr.xpm flag_bk_wh.xpm flag_bl_wh.xpm flag_wh_bk.xpm -xpm_DATA += golf.xpm -xpm_DATA += gc_tradi.xpm -xpm_DATA += gc_multi.xpm -xpm_DATA += gc_mystery.xpm -xpm_DATA += gc_event.xpm -xpm_DATA += gc_reference.xpm -xpm_DATA += gc_webcam.xpm -xpm_DATA += gc_question.xpm -xpm_DATA += gc_stages.xpm xpm_DATA += highway_exit.xpm xpm_DATA += hunting_stand.xpm -xpm_DATA += justice.xpm xpm_DATA += level_crossing.xpm xpm_DATA += library.xpm xpm_DATA += memorial.xpm -xpm_DATA += military.xpm -xpm_DATA += nav_left_1.xpm nav_left_2.xpm -xpm_DATA += nav_right_1.xpm nav_right_2.xpm -xpm_DATA += nav_straight.xpm nav_straight_32.xpm -xpm_DATA += nav_left_1_32.xpm nav_left_2_32.xpm -xpm_DATA += nav_right_1_32.xpm nav_right_2_32.xpm xpm_DATA += picnic.xpm xpm_DATA += potable_water.xpm -xpm_DATA += restroom.xpm xpm_DATA += shelter.xpm -xpm_DATA += skiing.xpm xpm_DATA += sport.xpm -xpm_DATA += swimming.xpm xpm_DATA += theater.xpm -xpm_DATA += toilets.xpm xpm_DATA += tower.xpm xpm_DATA += townhall.xpm xpm_DATA += trailerpark.xpm xpm_DATA += unknown.xpm +xpm_DATA += public_office.xpm + + +## Obsolete. Should be removed eventually... + +xpm_DATA += bench.xpm +xpm_DATA += biergarten.xpm +xpm_DATA += boundary_stone.xpm +xpm_DATA += fountain.xpm +xpm_DATA += golf.xpm +xpm_DATA += justice.xpm +xpm_DATA += military.xpm +xpm_DATA += restroom.xpm +xpm_DATA += ruins.xpm +xpm_DATA += skiing.xpm +xpm_DATA += swimming.xpm +xpm_DATA += toilets.xpm xpm_DATA += wifi.xpm -xpm_DATA += toggle_fullscreen.xpm + +## Obsolete end + + +xpm_DATA += flag_bk_tr.xpm +xpm_DATA += flag_bk_wh.xpm +xpm_DATA += flag_bl_wh.xpm +xpm_DATA += flag_wh_bk.xpm + +xpm_DATA += gc_tradi.xpm +xpm_DATA += gc_multi.xpm +xpm_DATA += gc_mystery.xpm +xpm_DATA += gc_event.xpm +xpm_DATA += gc_reference.xpm +xpm_DATA += gc_webcam.xpm +xpm_DATA += gc_question.xpm +xpm_DATA += gc_stages.xpm + +xpm_DATA += nav_left_1.xpm +xpm_DATA += nav_left_2.xpm +xpm_DATA += nav_right_1.xpm +xpm_DATA += nav_right_2.xpm +xpm_DATA += nav_straight.xpm +xpm_DATA += nav_straight_32.xpm +xpm_DATA += nav_left_1_32.xpm +xpm_DATA += nav_left_2_32.xpm +xpm_DATA += nav_right_1_32.xpm +xpm_DATA += nav_right_2_32.xpm + xpm_DATA += menu.xpm -xpm_DATA += public_office.xpm +xpm_DATA += toggle_fullscreen.xpm svgs = gui_about.svg svgs += gui_actions.svg @@ -67,8 +86,8 @@ svgs += gui_sound_off.svg svgs += gui_tools.svg svgs += gui_fullscreen.svg svgs += gui_leave_fullscreen.svg -svgs += mark.svg -svgs += gui_quit.svg gui_stop.svg +svgs += gui_quit.svg +svgs += gui_stop.svg svgs += gui_town.svg svgs += gui_vehicle.svg svgs += gui_vehicle_pedestrian.svg @@ -76,7 +95,6 @@ svgs += gui_zoom_in.svg svgs += gui_zoom_out.svg svgs += zoom_in.svg svgs += zoom_out.svg -svgs += tec_common.svg svgs += gui_select_street.svg svgs += gui_select_town.svg svgs += gui_select_country.svg @@ -99,7 +117,10 @@ svgs += airport.svg svgs += attraction.svg svgs += bank.svg svgs += bar.svg +svgs += beer.svg +svgs += bench.svg svgs += boat_ramp.svg +svgs += boundary_stone.svg svgs += bus.svg svgs += cafe.svg svgs += camping.svg @@ -109,10 +130,15 @@ svgs += danger.svg svgs += exit.svg svgs += fastfood.svg svgs += firebrigade.svg +svgs += fountain.svg svgs += fuel.svg +svgs += golf.svg svgs += hospital.svg svgs += hotel.svg svgs += information.svg +svgs += justice.svg +svgs += mark.svg +svgs += military.svg svgs += mini_roundabout.svg svgs += museum.svg svgs += parking.svg @@ -123,17 +149,24 @@ svgs += post.svg svgs += repair_service.svg svgs += resort.svg svgs += restaurant.svg +svgs += ruins.svg svgs += school.svg svgs += shopping.svg svgs += shop_grocery.svg +svgs += skiing.svg svgs += stadium.svg +svgs += swimming.svg +svgs += tec_common.svg svgs += telephone.svg +svgs += toilets.svg svgs += traffic_signals.svg svgs += church.svg svgs += zoo.svg svgs += heliport.svg +svgs += wifi.svg svgs += viewpoint.svg + nav_svgs = nav_left_1_bk.svg nav_left_1_wh.svg nav_left_2_bk.svg nav_left_2_wh.svg nav_left_3_bk.svg nav_left_3_wh.svg nav_svgs += nav_right_1_bk.svg nav_right_1_wh.svg nav_right_2_bk.svg nav_right_2_wh.svg nav_right_3_bk.svg nav_right_3_wh.svg nav_svgs += nav_roundabout_l1_bk.svg nav_roundabout_l1_wh.svg nav_roundabout_l2_bk.svg nav_roundabout_l2_wh.svg diff --git a/navit/navit/xpm/beer.svg b/navit/navit/xpm/beer.svg new file mode 100644 index 0000000..44c6083 --- /dev/null +++ b/navit/navit/xpm/beer.svg @@ -0,0 +1,139 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/navit/navit/xpm/bench.svg b/navit/navit/xpm/bench.svg new file mode 100644 index 0000000..032b41a --- /dev/null +++ b/navit/navit/xpm/bench.svg @@ -0,0 +1,469 @@ + + + +image/svg+xmlbench g.aoi +bench g.aoi + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/navit/navit/xpm/boundary_stone.svg b/navit/navit/xpm/boundary_stone.svg new file mode 100644 index 0000000..15a3def --- /dev/null +++ b/navit/navit/xpm/boundary_stone.svg @@ -0,0 +1,320 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/navit/navit/xpm/fountain.svg b/navit/navit/xpm/fountain.svg new file mode 100644 index 0000000..5b0d915 --- /dev/null +++ b/navit/navit/xpm/fountain.svg @@ -0,0 +1,452 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/navit/navit/xpm/golf.svg b/navit/navit/xpm/golf.svg new file mode 100644 index 0000000..45c11b6 --- /dev/null +++ b/navit/navit/xpm/golf.svg @@ -0,0 +1,186 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/navit/navit/xpm/justice.svg b/navit/navit/xpm/justice.svg new file mode 100644 index 0000000..c09aef8 --- /dev/null +++ b/navit/navit/xpm/justice.svg @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/navit/navit/xpm/military.svg b/navit/navit/xpm/military.svg new file mode 100644 index 0000000..e8d0fe9 --- /dev/null +++ b/navit/navit/xpm/military.svg @@ -0,0 +1,310 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/navit/navit/xpm/ruins.svg b/navit/navit/xpm/ruins.svg new file mode 100644 index 0000000..4a158d2 --- /dev/null +++ b/navit/navit/xpm/ruins.svg @@ -0,0 +1,801 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/navit/navit/xpm/skiing.svg b/navit/navit/xpm/skiing.svg new file mode 100644 index 0000000..61cfda8 --- /dev/null +++ b/navit/navit/xpm/skiing.svg @@ -0,0 +1,332 @@ + + + + + + + + image/svg+xml + + Hotel is near a ski area + + + + + Hotel is near a ski area + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/navit/navit/xpm/swimming.svg b/navit/navit/xpm/swimming.svg new file mode 100644 index 0000000..6a59c2b --- /dev/null +++ b/navit/navit/xpm/swimming.svg @@ -0,0 +1,335 @@ + + + + + + + + image/svg+xml + + Hotel has pool + + + + + Hotel has pool + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/navit/navit/xpm/toilets.svg b/navit/navit/xpm/toilets.svg new file mode 100644 index 0000000..0ff879c --- /dev/null +++ b/navit/navit/xpm/toilets.svg @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + image/svg+xml + + + 26.06.2008 + + + Jakub Klawiter + + + + + toilet + sign + man + woman + + + + + + + + + + + + + + + + + + + diff --git a/navit/navit/xpm/wifi.svg b/navit/navit/xpm/wifi.svg new file mode 100644 index 0000000..62f82c0 --- /dev/null +++ b/navit/navit/xpm/wifi.svg @@ -0,0 +1,127 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + -- 2.7.4