FlipIt graphics rework: * Adjusted token sizes to make them fit better on the various LCDs (4 different sizes, a 5th size is planned). Correct aspect ratio for archos bitmap LCD. Graphics work by Marianne Arnold.* Major code cleanup, use bitmap build system for all sizes. Info panel is now always displayed below.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11228 a1c6a512-1295-4272-9138-f99709370657

17 files changed, 25 insertions, 11 deletions

diff --git a/apps/plugins/bitmaps/mono/SOURCES b/apps/plugins/bitmaps/mono/SOURCES
index 9dfc312..75b85d1 100644
--- a/apps/plugins/bitmaps/mono/SOURCES
+++ b/apps/plugins/bitmaps/mono/SOURCES
@@ -32,4 +32,13 @@ brickmania_powerups.112x64x1.bmp
 rockblox_background.112x64x1.bmp
 #endif
 
+/* Flip it */
+#ifndef HAVE_LCD_COLOR
+#if LCD_WIDTH >= 125 && LCD_HEIGHT >= 110
+flipit_cursor.25x25x1.bmp
+#elif LCD_WIDTH >= 80 && LCD_HEIGHT >= 62
+flipit_cursor.16x13x1.bmp
+#endif
+#endif
+
 #endif /* HAVE_LCD_BITMAP */
diff --git a/apps/plugins/bitmaps/mono/flipit_cursor.16x13x1.bmp b/apps/plugins/bitmaps/mono/flipit_cursor.16x13x1.bmp
new file mode 100755
index 0000000..38db15a
--- /dev/null
+++ b/apps/plugins/bitmaps/mono/flipit_cursor.16x13x1.bmp
diff --git a/apps/plugins/bitmaps/mono/flipit_cursor.25x25x1.bmp b/apps/plugins/bitmaps/mono/flipit_cursor.25x25x1.bmp
new file mode 100755
index 0000000..5445f8b
--- /dev/null
+++ b/apps/plugins/bitmaps/mono/flipit_cursor.25x25x1.bmp
diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES
index c5729a0..c7eaa91 100644
--- a/apps/plugins/bitmaps/native/SOURCES
+++ b/apps/plugins/bitmaps/native/SOURCES
@@ -127,18 +127,23 @@ sokoban_tiles.6x6x2.bmp
 
 /* Flip it */
 #ifdef HAVE_LCD_COLOR
-#if LCD_HEIGHT >= 200
-flipit_tokens.50x50.bmp
-#elif LCD_HEIGHT >= 160
-flipit_tokens.40x40.bmp
-#else
-flipit_tokens.30x30.bmp
+#if LCD_WIDTH >= 280 && LCD_HEIGHT >= 234
+flipit_cursor.56x56x16.bmp
+flipit_tokens.56x112x16.bmp
+#elif LCD_WIDTH >= 200 && LCD_HEIGHT >= 170
+flipit_cursor.40x40x16.bmp
+flipit_tokens.40x80x16.bmp
+#elif LCD_WIDTH >= 125 && LCD_HEIGHT >= 110
+flipit_cursor.25x25x16.bmp
+flipit_tokens.25x50x16.bmp
 #endif
-#elif LCD_DEPTH >= 2
-#if LCD_WIDTH >= 150
-flipit_tokens.30x30x2.bmp
-#else
-flipit_tokens.20x20x2.bmp
+#elif LCD_DEPTH > 1 /* greyscale */
+#if LCD_WIDTH >= 125 && LCD_HEIGHT >= 110
+flipit_tokens.25x50x2.bmp
+#endif
+#else /* monochrome */
+#if LCD_WIDTH >= 80 && LCD_HEIGHT >= 62
+flipit_tokens.16x26x1.bmp
 #endif
 #endif
 
diff --git a/apps/plugins/bitmaps/native/flipit_cursor.25x25x16.bmp b/apps/plugins/bitmaps/native/flipit_cursor.25x25x16.bmp
new file mode 100755
index 0000000..faa8151
--- /dev/null
+++ b/apps/plugins/bitmaps/native/flipit_cursor.25x25x16.bmp
diff --git a/apps/plugins/bitmaps/native/flipit_cursor.40x40x16.bmp b/apps/plugins/bitmaps/native/flipit_cursor.40x40x16.bmp
new file mode 100755
index 0000000..d91a363
--- /dev/null
+++ b/apps/plugins/bitmaps/native/flipit_cursor.40x40x16.bmp
diff --git a/apps/plugins/bitmaps/native/flipit_cursor.56x56x16.bmp b/apps/plugins/bitmaps/native/flipit_cursor.56x56x16.bmp
new file mode 100755
index 0000000..7fffb25
--- /dev/null
+++ b/apps/plugins/bitmaps/native/flipit_cursor.56x56x16.bmp
diff --git a/apps/plugins/bitmaps/native/flipit_tokens.16x26x1.bmp b/apps/plugins/bitmaps/native/flipit_tokens.16x26x1.bmp
new file mode 100755
index 0000000..fcf164b
--- /dev/null
+++ b/apps/plugins/bitmaps/native/flipit_tokens.16x26x1.bmp
diff --git a/apps/plugins/bitmaps/native/flipit_tokens.20x20x2.bmp b/apps/plugins/bitmaps/native/flipit_tokens.20x20x2.bmp
deleted file mode 100644
index 5dbae76..0000000
--- a/apps/plugins/bitmaps/native/flipit_tokens.20x20x2.bmp
+++ /dev/null
diff --git a/apps/plugins/bitmaps/native/flipit_tokens.25x50x16.bmp b/apps/plugins/bitmaps/native/flipit_tokens.25x50x16.bmp
new file mode 100755
index 0000000..deca4c7
--- /dev/null
+++ b/apps/plugins/bitmaps/native/flipit_tokens.25x50x16.bmp
diff --git a/apps/plugins/bitmaps/native/flipit_tokens.25x50x2.bmp b/apps/plugins/bitmaps/native/flipit_tokens.25x50x2.bmp
new file mode 100755
index 0000000..e2db260
--- /dev/null
+++ b/apps/plugins/bitmaps/native/flipit_tokens.25x50x2.bmp
diff --git a/apps/plugins/bitmaps/native/flipit_tokens.30x30.bmp b/apps/plugins/bitmaps/native/flipit_tokens.30x30.bmp
deleted file mode 100644
index 7aa7748..0000000
--- a/apps/plugins/bitmaps/native/flipit_tokens.30x30.bmp
+++ /dev/null
diff --git a/apps/plugins/bitmaps/native/flipit_tokens.30x30x2.bmp b/apps/plugins/bitmaps/native/flipit_tokens.30x30x2.bmp
deleted file mode 100644
index 63262b5..0000000
--- a/apps/plugins/bitmaps/native/flipit_tokens.30x30x2.bmp
+++ /dev/null
diff --git a/apps/plugins/bitmaps/native/flipit_tokens.40x40.bmp b/apps/plugins/bitmaps/native/flipit_tokens.40x40.bmp
deleted file mode 100644
index b50245e..0000000
--- a/apps/plugins/bitmaps/native/flipit_tokens.40x40.bmp
+++ /dev/null
diff --git a/apps/plugins/bitmaps/native/flipit_tokens.40x80x16.bmp b/apps/plugins/bitmaps/native/flipit_tokens.40x80x16.bmp
new file mode 100755
index 0000000..3897502
--- /dev/null
+++ b/apps/plugins/bitmaps/native/flipit_tokens.40x80x16.bmp
diff --git a/apps/plugins/bitmaps/native/flipit_tokens.50x50.bmp b/apps/plugins/bitmaps/native/flipit_tokens.50x50.bmp
deleted file mode 100644
index bc2c543..0000000
--- a/apps/plugins/bitmaps/native/flipit_tokens.50x50.bmp
+++ /dev/null
diff --git a/apps/plugins/bitmaps/native/flipit_tokens.56x112x16.bmp b/apps/plugins/bitmaps/native/flipit_tokens.56x112x16.bmp
new file mode 100755
index 0000000..c56f9da
--- /dev/null
+++ b/apps/plugins/bitmaps/native/flipit_tokens.56x112x16.bmp