Pegbox - new graphics for Archos, c200, small H10, Mini, M3 - also cleaning and small tweaks to the rest of the greyscale and monochrome bitmaps. Aspect ratio correct the pieces for the Archos screen (now uses 9x7 tiles) which made it possible to also add the header with statistics). Necessary changes to pegbox.c: don't assume piece height = piece width, prepare a new 'wide' layout for the c200 with the statics at the side. Additional cleanup - make the code more readable by replacing repeatedly used bmpheight_XYZ with defines, splitting some too long lines. Let the 'Start on level' line in the menu actually appear on the Mini's screen. Also rename the greyscale graphics according convention to '...x2.bmp' and set the mime-type more accurately for all pegbox bitmaps. Finally, add Joel Puik, the creator of the original colour graphics to CREDITS.

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

32 files changed, 42 insertions, 18 deletions

diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES
index 31ee1f1..b95fd37 100644
--- a/apps/plugins/bitmaps/native/SOURCES
+++ b/apps/plugins/bitmaps/native/SOURCES
@@ -324,50 +324,74 @@ minesweeper_tiles.8x8x1.bmp
 #endif
 
 /* PegBox */
-#if (LCD_WIDTH >= 320) && (LCD_HEIGHT >= 240) && (LCD_DEPTH >= 16)
+#ifdef HAVE_LCD_COLOR
+/* currently only LCD_WIDTH is important, e.g. Nano and e200 use the same set */
+#if LCD_WIDTH >= 320
 pegbox_menu_top.320x68x16.bmp
 pegbox_menu_items.120x32x16.bmp
 pegbox_pieces.24x24x16.bmp
 pegbox_header.320x40x16.bmp
-#elif (LCD_WIDTH >= 240) && (LCD_HEIGHT >= 192) && (LCD_DEPTH >= 16)
+#elif LCD_WIDTH >= 240
 pegbox_menu_top.240x80x16.bmp
 pegbox_menu_items.120x32x16.bmp
 pegbox_pieces.16x16x16.bmp
 pegbox_header.240x40x16.bmp
-#elif (LCD_WIDTH >= 220) && (LCD_HEIGHT >= 176) && (LCD_DEPTH >= 16)
+#elif LCD_WIDTH >= 220
 pegbox_menu_top.220x60x16.bmp
 pegbox_menu_items.70x20x16.bmp
 pegbox_pieces.16x16x16.bmp
 pegbox_header.220x40x16.bmp
-#elif (LCD_WIDTH >= 176) && (LCD_HEIGHT >= 132) && (LCD_DEPTH >= 16)
+#elif LCD_WIDTH >= 176
 pegbox_menu_top.176x46x16.bmp
 pegbox_menu_items.60x17x16.bmp
 pegbox_pieces.12x12x16.bmp
 pegbox_header.176x28x16.bmp
-#elif (LCD_WIDTH >= 160) && (LCD_HEIGHT >= 128) && (LCD_DEPTH >= 16)
+#elif LCD_WIDTH >= 160
 pegbox_menu_top.160x42x16.bmp
 pegbox_menu_items.60x17x16.bmp
 pegbox_pieces.12x12x16.bmp
 pegbox_header.160x24x16.bmp
-#elif (LCD_WIDTH >= 160) && (LCD_HEIGHT >= 128) && (LCD_DEPTH > 1)
-pegbox_menu_top.160x42x4.bmp
-pegbox_menu_items.60x17x4.bmp
-pegbox_pieces.12x12x4.bmp
-pegbox_header.160x24x4.bmp
-#elif (LCD_WIDTH >= 138) && (LCD_HEIGHT >= 110) && (LCD_DEPTH > 1)
-pegbox_menu_top.138x34x4.bmp
-pegbox_menu_items.60x17x4.bmp
-pegbox_pieces.8x8x1.bmp
-pegbox_header.138x28x4.bmp
-#elif (LCD_WIDTH >= 160) && (LCD_HEIGHT >= 128) && (LCD_DEPTH == 1)
+#elif LCD_WIDTH >= 132
+pegbox_menu_top.132x17x16.bmp
+pegbox_menu_items.60x13x16.bmp
+pegbox_pieces.9x9x16.bmp
+pegbox_header.22x80x16.bmp
+#elif LCD_WIDTH >= 128
+pegbox_menu_top.128x42x16.bmp
+pegbox_menu_items.60x17x16.bmp
+pegbox_pieces.10x10x16.bmp
+pegbox_header.128x42x16.bmp
+#endif /* different colour displays */
+#elif LCD_DEPTH > 1
+#if LCD_WIDTH >= 160
+pegbox_menu_top.160x42x2.bmp
+pegbox_menu_items.60x17x2.bmp
+pegbox_pieces.12x12x2.bmp
+pegbox_header.160x24x2.bmp
+#elif LCD_WIDTH >= 138
+pegbox_menu_top.138x31x2.bmp
+pegbox_menu_items.60x17x2.bmp
+pegbox_pieces.10x10x2.bmp
+pegbox_header.138x26x2.bmp
+#elif LCD_WIDTH >= 128
+pegbox_menu_top.128x27x2.bmp
+pegbox_menu_items.60x15x2.bmp
+pegbox_pieces.10x10x2.bmp
+pegbox_header.128x16x2.bmp
+#endif /* different greyscale displays */
+#else /* mono */
+#if LCD_WIDTH >= 160
 pegbox_menu_top.160x42x1.bmp
 pegbox_menu_items.60x17x1.bmp
 pegbox_pieces.12x12x1.bmp
 pegbox_header.160x24x1.bmp
-#else
-pegbox_pieces.8x8x1.bmp
+#elif LCD_WIDTH >= 112
+pegbox_header.112x8x1.bmp
+pegbox_pieces.9x7x1.bmp
+#endif
 #endif
 
+
 /* Rockblox */
 #if LCD_DEPTH == 16 /* colour versions*/
 #if   (LCD_WIDTH >= 320) && (LCD_HEIGHT >= 240)
diff --git a/apps/plugins/bitmaps/native/pegbox_header.112x8x1.bmp b/apps/plugins/bitmaps/native/pegbox_header.112x8x1.bmp
new file mode 100644
index 0000000..fe2eab4
--- /dev/null
+++ b/apps/plugins/bitmaps/native/pegbox_header.112x8x1.bmp
diff --git a/apps/plugins/bitmaps/native/pegbox_header.128x16x2.bmp b/apps/plugins/bitmaps/native/pegbox_header.128x16x2.bmp
new file mode 100644
index 0000000..9ba96ec
--- /dev/null
+++ b/apps/plugins/bitmaps/native/pegbox_header.128x16x2.bmp
diff --git a/apps/plugins/bitmaps/native/pegbox_header.128x42x16.bmp b/apps/plugins/bitmaps/native/pegbox_header.128x42x16.bmp
new file mode 100644
index 0000000..539db34
--- /dev/null
+++ b/apps/plugins/bitmaps/native/pegbox_header.128x42x16.bmp
diff --git a/apps/plugins/bitmaps/native/pegbox_header.138x26x2.bmp b/apps/plugins/bitmaps/native/pegbox_header.138x26x2.bmp
new file mode 100644
index 0000000..5b46550
--- /dev/null
+++ b/apps/plugins/bitmaps/native/pegbox_header.138x26x2.bmp
diff --git a/apps/plugins/bitmaps/native/pegbox_header.138x28x4.bmp b/apps/plugins/bitmaps/native/pegbox_header.138x28x4.bmp
deleted file mode 100644
index 0754793..0000000
--- a/apps/plugins/bitmaps/native/pegbox_header.138x28x4.bmp
+++ /dev/null
diff --git a/apps/plugins/bitmaps/native/pegbox_header.160x24x1.bmp b/apps/plugins/bitmaps/native/pegbox_header.160x24x1.bmp
index 8f627f6..1ad6ef6 100644
--- a/apps/plugins/bitmaps/native/pegbox_header.160x24x1.bmp
+++ b/apps/plugins/bitmaps/native/pegbox_header.160x24x1.bmp
diff --git a/apps/plugins/bitmaps/native/pegbox_header.160x24x2.bmp b/apps/plugins/bitmaps/native/pegbox_header.160x24x2.bmp
new file mode 100644
index 0000000..fb583b6
--- /dev/null
+++ b/apps/plugins/bitmaps/native/pegbox_header.160x24x2.bmp
diff --git a/apps/plugins/bitmaps/native/pegbox_header.160x24x4.bmp b/apps/plugins/bitmaps/native/pegbox_header.160x24x4.bmp
deleted file mode 100644
index 444e780..0000000
--- a/apps/plugins/bitmaps/native/pegbox_header.160x24x4.bmp
+++ /dev/null
diff --git a/apps/plugins/bitmaps/native/pegbox_header.22x80x16.bmp b/apps/plugins/bitmaps/native/pegbox_header.22x80x16.bmp
new file mode 100644
index 0000000..c49723c
--- /dev/null
+++ b/apps/plugins/bitmaps/native/pegbox_header.22x80x16.bmp
diff --git a/apps/plugins/bitmaps/native/pegbox_menu_items.60x13x16.bmp b/apps/plugins/bitmaps/native/pegbox_menu_items.60x13x16.bmp
new file mode 100644
index 0000000..71ac4e0
--- /dev/null
+++ b/apps/plugins/bitmaps/native/pegbox_menu_items.60x13x16.bmp
diff --git a/apps/plugins/bitmaps/native/pegbox_menu_items.60x15x2.bmp b/apps/plugins/bitmaps/native/pegbox_menu_items.60x15x2.bmp
new file mode 100644
index 0000000..78d7658
--- /dev/null
+++ b/apps/plugins/bitmaps/native/pegbox_menu_items.60x15x2.bmp
diff --git a/apps/plugins/bitmaps/native/pegbox_menu_items.60x17x1.bmp b/apps/plugins/bitmaps/native/pegbox_menu_items.60x17x1.bmp
index dad5592..3a048cb 100644
--- a/apps/plugins/bitmaps/native/pegbox_menu_items.60x17x1.bmp
+++ b/apps/plugins/bitmaps/native/pegbox_menu_items.60x17x1.bmp
diff --git a/apps/plugins/bitmaps/native/pegbox_menu_items.60x17x16.bmp b/apps/plugins/bitmaps/native/pegbox_menu_items.60x17x16.bmp
index 6406641..955be06 100644
--- a/apps/plugins/bitmaps/native/pegbox_menu_items.60x17x16.bmp
+++ b/apps/plugins/bitmaps/native/pegbox_menu_items.60x17x16.bmp
diff --git a/apps/plugins/bitmaps/native/pegbox_menu_items.60x17x2.bmp b/apps/plugins/bitmaps/native/pegbox_menu_items.60x17x2.bmp
new file mode 100644
index 0000000..74f459f
--- /dev/null
+++ b/apps/plugins/bitmaps/native/pegbox_menu_items.60x17x2.bmp
diff --git a/apps/plugins/bitmaps/native/pegbox_menu_items.60x17x4.bmp b/apps/plugins/bitmaps/native/pegbox_menu_items.60x17x4.bmp
deleted file mode 100644
index dea62f7..0000000
--- a/apps/plugins/bitmaps/native/pegbox_menu_items.60x17x4.bmp
+++ /dev/null
diff --git a/apps/plugins/bitmaps/native/pegbox_menu_top.128x27x2.bmp b/apps/plugins/bitmaps/native/pegbox_menu_top.128x27x2.bmp
new file mode 100644
index 0000000..a37bb01
--- /dev/null
+++ b/apps/plugins/bitmaps/native/pegbox_menu_top.128x27x2.bmp
diff --git a/apps/plugins/bitmaps/native/pegbox_menu_top.128x42x16.bmp b/apps/plugins/bitmaps/native/pegbox_menu_top.128x42x16.bmp
new file mode 100644
index 0000000..f15ae0b
--- /dev/null
+++ b/apps/plugins/bitmaps/native/pegbox_menu_top.128x42x16.bmp
diff --git a/apps/plugins/bitmaps/native/pegbox_menu_top.132x17x16.bmp b/apps/plugins/bitmaps/native/pegbox_menu_top.132x17x16.bmp
new file mode 100644
index 0000000..2257f7c
--- /dev/null
+++ b/apps/plugins/bitmaps/native/pegbox_menu_top.132x17x16.bmp
diff --git a/apps/plugins/bitmaps/native/pegbox_menu_top.138x31x2.bmp b/apps/plugins/bitmaps/native/pegbox_menu_top.138x31x2.bmp
new file mode 100644
index 0000000..a86306c
--- /dev/null
+++ b/apps/plugins/bitmaps/native/pegbox_menu_top.138x31x2.bmp
diff --git a/apps/plugins/bitmaps/native/pegbox_menu_top.138x34x4.bmp b/apps/plugins/bitmaps/native/pegbox_menu_top.138x34x4.bmp
deleted file mode 100644
index 3184d74..0000000
--- a/apps/plugins/bitmaps/native/pegbox_menu_top.138x34x4.bmp
+++ /dev/null
diff --git a/apps/plugins/bitmaps/native/pegbox_menu_top.160x42x1.bmp b/apps/plugins/bitmaps/native/pegbox_menu_top.160x42x1.bmp
index 2527299..cd46ef2 100644
--- a/apps/plugins/bitmaps/native/pegbox_menu_top.160x42x1.bmp
+++ b/apps/plugins/bitmaps/native/pegbox_menu_top.160x42x1.bmp
diff --git a/apps/plugins/bitmaps/native/pegbox_menu_top.160x42x2.bmp b/apps/plugins/bitmaps/native/pegbox_menu_top.160x42x2.bmp
new file mode 100644
index 0000000..7095d0f
--- /dev/null
+++ b/apps/plugins/bitmaps/native/pegbox_menu_top.160x42x2.bmp
diff --git a/apps/plugins/bitmaps/native/pegbox_menu_top.160x42x4.bmp b/apps/plugins/bitmaps/native/pegbox_menu_top.160x42x4.bmp
deleted file mode 100644
index 6aec917..0000000
--- a/apps/plugins/bitmaps/native/pegbox_menu_top.160x42x4.bmp
+++ /dev/null
diff --git a/apps/plugins/bitmaps/native/pegbox_pieces.10x10x16.bmp b/apps/plugins/bitmaps/native/pegbox_pieces.10x10x16.bmp
new file mode 100644
index 0000000..8bb2cc9
--- /dev/null
+++ b/apps/plugins/bitmaps/native/pegbox_pieces.10x10x16.bmp
diff --git a/apps/plugins/bitmaps/native/pegbox_pieces.10x10x2.bmp b/apps/plugins/bitmaps/native/pegbox_pieces.10x10x2.bmp
new file mode 100644
index 0000000..192d4ed
--- /dev/null
+++ b/apps/plugins/bitmaps/native/pegbox_pieces.10x10x2.bmp
diff --git a/apps/plugins/bitmaps/native/pegbox_pieces.12x12x1.bmp b/apps/plugins/bitmaps/native/pegbox_pieces.12x12x1.bmp
index c3eab83..d0b197f 100644
--- a/apps/plugins/bitmaps/native/pegbox_pieces.12x12x1.bmp
+++ b/apps/plugins/bitmaps/native/pegbox_pieces.12x12x1.bmp
diff --git a/apps/plugins/bitmaps/native/pegbox_pieces.12x12x2.bmp b/apps/plugins/bitmaps/native/pegbox_pieces.12x12x2.bmp
new file mode 100644
index 0000000..4218627
--- /dev/null
+++ b/apps/plugins/bitmaps/native/pegbox_pieces.12x12x2.bmp
diff --git a/apps/plugins/bitmaps/native/pegbox_pieces.12x12x4.bmp b/apps/plugins/bitmaps/native/pegbox_pieces.12x12x4.bmp
deleted file mode 100644
index 5b75c3f..0000000
--- a/apps/plugins/bitmaps/native/pegbox_pieces.12x12x4.bmp
+++ /dev/null
diff --git a/apps/plugins/bitmaps/native/pegbox_pieces.8x8x1.bmp b/apps/plugins/bitmaps/native/pegbox_pieces.8x8x1.bmp
deleted file mode 100644
index 0b341b9..0000000
--- a/apps/plugins/bitmaps/native/pegbox_pieces.8x8x1.bmp
+++ /dev/null
diff --git a/apps/plugins/bitmaps/native/pegbox_pieces.9x7x1.bmp b/apps/plugins/bitmaps/native/pegbox_pieces.9x7x1.bmp
new file mode 100644
index 0000000..c06d67d
--- /dev/null
+++ b/apps/plugins/bitmaps/native/pegbox_pieces.9x7x1.bmp
diff --git a/apps/plugins/bitmaps/native/pegbox_pieces.9x9x16.bmp b/apps/plugins/bitmaps/native/pegbox_pieces.9x9x16.bmp
new file mode 100644
index 0000000..cf1be93
--- /dev/null
+++ b/apps/plugins/bitmaps/native/pegbox_pieces.9x9x16.bmp