From fc48c383a9e5964a7edd51b2ff965ddc2125c4cf Mon Sep 17 00:00:00 2001 From: sleske Date: Fri, 30 Mar 2012 18:49:12 +0000 Subject: [PATCH] Add:xpm:New SVGs menu.svg, toggle_fullscreen.svg, some xpm->svg transitions fixed.|Taken from #877; thanks themroc! git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@5003 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- navit/navit/navit_shipped.xml | 82 +++++++++++++-------------- navit/navit/xpm/Makefile.am | 9 ++- navit/navit/xpm/menu.svg | 103 ++++++++++++++++++++++++++++++++++ navit/navit/xpm/toggle_fullscreen.svg | 86 ++++++++++++++++++++++++++++ 4 files changed, 236 insertions(+), 44 deletions(-) create mode 100644 navit/navit/xpm/menu.svg create mode 100644 navit/navit/xpm/toggle_fullscreen.svg diff --git a/navit/navit/navit_shipped.xml b/navit/navit/navit_shipped.xml index 37ed773..920e8ec 100644 --- a/navit/navit/navit_shipped.xml +++ b/navit/navit/navit_shipped.xml @@ -102,8 +102,8 @@ Navigation - - + + @@ -1790,10 +1790,10 @@ Navigation - + - + @@ -1889,13 +1889,13 @@ Navigation - + - + @@ -1919,7 +1919,7 @@ Navigation - + @@ -1928,16 +1928,16 @@ Navigation - + - + - + @@ -1973,7 +1973,7 @@ Navigation - + @@ -2009,7 +2009,7 @@ Navigation - + @@ -2075,19 +2075,19 @@ Navigation - + - + - + - + @@ -2120,13 +2120,13 @@ Navigation - + - + @@ -2153,7 +2153,7 @@ Navigation - + @@ -3159,10 +3159,10 @@ Navigation - + - + @@ -3174,7 +3174,7 @@ Navigation - + @@ -3204,10 +3204,10 @@ Navigation - + - + @@ -3264,13 +3264,13 @@ Navigation - + - + @@ -3294,7 +3294,7 @@ Navigation - + @@ -3303,16 +3303,16 @@ Navigation - + - + - + @@ -3348,13 +3348,13 @@ Navigation - + - + @@ -3384,7 +3384,7 @@ Navigation - + @@ -3435,7 +3435,7 @@ Navigation - + @@ -3450,19 +3450,19 @@ Navigation - + - + - + - + @@ -3495,7 +3495,7 @@ Navigation - + @@ -3531,7 +3531,7 @@ Navigation - + @@ -6540,7 +6540,7 @@ Navigation - + diff --git a/navit/navit/xpm/Makefile.am b/navit/navit/xpm/Makefile.am index b63f955..7645ff3 100644 --- a/navit/navit/xpm/Makefile.am +++ b/navit/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/navit/xpm/menu.svg b/navit/navit/xpm/menu.svg new file mode 100644 index 0000000..ae79e78 --- /dev/null +++ b/navit/navit/xpm/menu.svg @@ -0,0 +1,103 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/navit/navit/xpm/toggle_fullscreen.svg b/navit/navit/xpm/toggle_fullscreen.svg new file mode 100644 index 0000000..0d64d21 --- /dev/null +++ b/navit/navit/xpm/toggle_fullscreen.svg @@ -0,0 +1,86 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + -- 2.7.4