summaryrefslogtreecommitdiffstats
path: root/uisimulator
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2008-07-08 23:27:09 +0000
committerDave Chapman <dave@dchapman.com>2008-07-08 23:27:09 +0000
commitee4ff052c2451f467280de576458f368e5bee401 (patch)
treea54b88dc61e704a87b6f374d4f0b39426808a103 /uisimulator
parenta1a0ae631c91827492e2aad549a530b3aafa799b (diff)
downloadrockbox-ee4ff052c2451f467280de576458f368e5bee401.tar.gz
rockbox-ee4ff052c2451f467280de576458f368e5bee401.tar.bz2
rockbox-ee4ff052c2451f467280de576458f368e5bee401.zip
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
Diffstat (limited to 'uisimulator')
-rw-r--r--uisimulator/sdl/UI-ipod1g2g.bmpbin86644 -> 86642 bytes
-rw-r--r--uisimulator/sdl/UI-ipod3g.bmpbin86660 -> 86658 bytes
-rw-r--r--uisimulator/sdl/UI-ipod4g.bmpbin217614 -> 217614 bytes
-rw-r--r--uisimulator/sdl/UI-ipodcolor.bmpbin131232 -> 131230 bytes
-rw-r--r--uisimulator/sdl/UI-ipodmini.bmpbin71160 -> 71158 bytes
-rw-r--r--uisimulator/sdl/UI-ipodmini2g.bmpbin71160 -> 71158 bytes
-rw-r--r--uisimulator/sdl/UI-ipodnano.bmpbin85280 -> 85278 bytes
-rw-r--r--uisimulator/sdl/UI-ipodvideo.bmpbin209110 -> 209110 bytes
-rw-r--r--uisimulator/sdl/button.c4
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
--- a/uisimulator/sdl/UI-ipod1g2g.bmp
+++ b/uisimulator/sdl/UI-ipod1g2g.bmp
Binary files differ
diff --git a/uisimulator/sdl/UI-ipod3g.bmp b/uisimulator/sdl/UI-ipod3g.bmp
index b904ccf924..e8a0b956ba 100644
--- a/uisimulator/sdl/UI-ipod3g.bmp
+++ b/uisimulator/sdl/UI-ipod3g.bmp
Binary files differ
diff --git a/uisimulator/sdl/UI-ipod4g.bmp b/uisimulator/sdl/UI-ipod4g.bmp
index b24c560d1c..b6f7cd94e0 100644
--- a/uisimulator/sdl/UI-ipod4g.bmp
+++ b/uisimulator/sdl/UI-ipod4g.bmp
Binary files differ
diff --git a/uisimulator/sdl/UI-ipodcolor.bmp b/uisimulator/sdl/UI-ipodcolor.bmp
index de5dad4ffe..a32fc8e519 100644
--- a/uisimulator/sdl/UI-ipodcolor.bmp
+++ b/uisimulator/sdl/UI-ipodcolor.bmp
Binary files differ
diff --git a/uisimulator/sdl/UI-ipodmini.bmp b/uisimulator/sdl/UI-ipodmini.bmp
index 5ea87b2d94..63b69d5a08 100644
--- a/uisimulator/sdl/UI-ipodmini.bmp
+++ b/uisimulator/sdl/UI-ipodmini.bmp
Binary files differ
diff --git a/uisimulator/sdl/UI-ipodmini2g.bmp b/uisimulator/sdl/UI-ipodmini2g.bmp
index 5ea87b2d94..63b69d5a08 100644
--- a/uisimulator/sdl/UI-ipodmini2g.bmp
+++ b/uisimulator/sdl/UI-ipodmini2g.bmp
Binary files differ
diff --git a/uisimulator/sdl/UI-ipodnano.bmp b/uisimulator/sdl/UI-ipodnano.bmp
index e33f7e81da..8abbb16845 100644
--- a/uisimulator/sdl/UI-ipodnano.bmp
+++ b/uisimulator/sdl/UI-ipodnano.bmp
Binary files differ
diff --git a/uisimulator/sdl/UI-ipodvideo.bmp b/uisimulator/sdl/UI-ipodvideo.bmp
index 5ad67aeb5d..e490449564 100644
--- a/uisimulator/sdl/UI-ipodvideo.bmp
+++ b/uisimulator/sdl/UI-ipodvideo.bmp
Binary files 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: