From ee4ff052c2451f467280de576458f368e5bee401 Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Tue, 8 Jul 2008 23:27:09 +0000 Subject: Revert r17988 and instead fix the button labels in the ipod simulator background images. This isn't 100% perfect (I didn't go back to the layered source images), but IMO is good enough. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17991 a1c6a512-1295-4272-9138-f99709370657 --- uisimulator/sdl/UI-ipod1g2g.bmp | Bin 86644 -> 86642 bytes uisimulator/sdl/UI-ipod3g.bmp | Bin 86660 -> 86658 bytes uisimulator/sdl/UI-ipod4g.bmp | Bin 217614 -> 217614 bytes uisimulator/sdl/UI-ipodcolor.bmp | Bin 131232 -> 131230 bytes uisimulator/sdl/UI-ipodmini.bmp | Bin 71160 -> 71158 bytes uisimulator/sdl/UI-ipodmini2g.bmp | Bin 71160 -> 71158 bytes uisimulator/sdl/UI-ipodnano.bmp | Bin 85280 -> 85278 bytes uisimulator/sdl/UI-ipodvideo.bmp | Bin 209110 -> 209110 bytes uisimulator/sdl/button.c | 4 ++-- 9 files changed, 2 insertions(+), 2 deletions(-) diff --git a/uisimulator/sdl/UI-ipod1g2g.bmp b/uisimulator/sdl/UI-ipod1g2g.bmp index 54473422e1..2e28dbaa80 100644 Binary files a/uisimulator/sdl/UI-ipod1g2g.bmp and b/uisimulator/sdl/UI-ipod1g2g.bmp differ diff --git a/uisimulator/sdl/UI-ipod3g.bmp b/uisimulator/sdl/UI-ipod3g.bmp index b904ccf924..e8a0b956ba 100644 Binary files a/uisimulator/sdl/UI-ipod3g.bmp and b/uisimulator/sdl/UI-ipod3g.bmp differ diff --git a/uisimulator/sdl/UI-ipod4g.bmp b/uisimulator/sdl/UI-ipod4g.bmp index b24c560d1c..b6f7cd94e0 100644 Binary files a/uisimulator/sdl/UI-ipod4g.bmp and b/uisimulator/sdl/UI-ipod4g.bmp differ diff --git a/uisimulator/sdl/UI-ipodcolor.bmp b/uisimulator/sdl/UI-ipodcolor.bmp index de5dad4ffe..a32fc8e519 100644 Binary files a/uisimulator/sdl/UI-ipodcolor.bmp and b/uisimulator/sdl/UI-ipodcolor.bmp differ diff --git a/uisimulator/sdl/UI-ipodmini.bmp b/uisimulator/sdl/UI-ipodmini.bmp index 5ea87b2d94..63b69d5a08 100644 Binary files a/uisimulator/sdl/UI-ipodmini.bmp and b/uisimulator/sdl/UI-ipodmini.bmp differ diff --git a/uisimulator/sdl/UI-ipodmini2g.bmp b/uisimulator/sdl/UI-ipodmini2g.bmp index 5ea87b2d94..63b69d5a08 100644 Binary files a/uisimulator/sdl/UI-ipodmini2g.bmp and b/uisimulator/sdl/UI-ipodmini2g.bmp differ diff --git a/uisimulator/sdl/UI-ipodnano.bmp b/uisimulator/sdl/UI-ipodnano.bmp index e33f7e81da..8abbb16845 100644 Binary files a/uisimulator/sdl/UI-ipodnano.bmp and b/uisimulator/sdl/UI-ipodnano.bmp differ diff --git a/uisimulator/sdl/UI-ipodvideo.bmp b/uisimulator/sdl/UI-ipodvideo.bmp index 5ad67aeb5d..e490449564 100644 Binary files a/uisimulator/sdl/UI-ipodvideo.bmp and b/uisimulator/sdl/UI-ipodvideo.bmp differ diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c index 9a4a3c1219..843f685226 100644 --- a/uisimulator/sdl/button.c +++ b/uisimulator/sdl/button.c @@ -372,11 +372,11 @@ void button_event(int key, bool pressed) break; case SDLK_KP8: case SDLK_UP: - new_btn = BUTTON_SCROLL_FWD; + new_btn = BUTTON_SCROLL_BACK; break; case SDLK_KP2: case SDLK_DOWN: - new_btn = BUTTON_SCROLL_BACK; + new_btn = BUTTON_SCROLL_FWD; break; case SDLK_KP_PLUS: case SDLK_F8: -- cgit v1.2.3