Sudoku: * Changed the LCD size ifdef magic to ease adding of new LCD resolutions. * Added vertical layout option with the scratchpad at the bottom (Gigabeat). * New Bitmaps for iPod Mini, iPod Video and Gigabeat, and slightly modified bitmaps for Archos, by Marianne Arnold.

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

10 files changed, 17 insertions, 1 deletions

diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES
index 54cd6fd569..98c3eef443 100644
--- a/apps/plugins/bitmaps/native/SOURCES
+++ b/apps/plugins/bitmaps/native/SOURCES
@@ -175,19 +175,35 @@ solitaire_suitsi.15x16x1.bmp
 #endif
 
 /* Sudoku */
+#if LCD_WIDTH >= LCD_HEIGHT
 #if (LCD_WIDTH == 112) && (LCD_HEIGHT==64) && (LCD_DEPTH == 1)
 sudoku_start.112x64x1.bmp
 sudoku_normal.112x64x1.bmp
 sudoku_inverse.112x64x1.bmp
+#elif (LCD_WIDTH == 138) && (LCD_HEIGHT == 110) && (LCD_DEPTH >= 2)
+sudoku_start.138x110x2.bmp
+sudoku_normal.138x110x2.bmp
+sudoku_inverse.138x110x2.bmp
 #elif ((LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && (LCD_DEPTH >= 2)) || \
       ((LCD_WIDTH == 176) && (LCD_HEIGHT == 132) && (LCD_DEPTH >= 2))
 sudoku_start.160x128x2.bmp
 sudoku_normal.160x128x2.bmp
 sudoku_inverse.160x128x2.bmp
-#elif (LCD_WIDTH >= 220) && (LCD_HEIGHT >= 176) && (LCD_DEPTH == 16)
+#elif (LCD_WIDTH == 220) && (LCD_HEIGHT == 176) && (LCD_DEPTH == 16)
 sudoku_start.220x176x16.bmp
 sudoku_normal.220x176x16.bmp
 sudoku_inverse.220x176x16.bmp
+#elif (LCD_WIDTH >= 320) && (LCD_HEIGHT >= 240) && (LCD_DEPTH == 16)
+sudoku_start.320x240x16.bmp
+sudoku_normal.320x240x16.bmp
+sudoku_inverse.320x240x16.bmp
+#endif
+#else
+#if (LCD_WIDTH >= 240) && (LCD_HEIGHT >= 320) && (LCD_DEPTH == 16)
+sudoku_start.320x240x16.bmp
+sudoku_normal.320x240x16.bmp
+sudoku_inverse.320x240x16.bmp
+#endif
 #endif
 
 /* Brickmania */
diff --git a/apps/plugins/bitmaps/native/sudoku_inverse.112x64x1.bmp b/apps/plugins/bitmaps/native/sudoku_inverse.112x64x1.bmp
index 161a43e78c..f5e8977904 100644
--- a/apps/plugins/bitmaps/native/sudoku_inverse.112x64x1.bmp
+++ b/apps/plugins/bitmaps/native/sudoku_inverse.112x64x1.bmp
diff --git a/apps/plugins/bitmaps/native/sudoku_inverse.138x110x2.bmp b/apps/plugins/bitmaps/native/sudoku_inverse.138x110x2.bmp
new file mode 100755
index 0000000000..601b16a20d
--- /dev/null
+++ b/apps/plugins/bitmaps/native/sudoku_inverse.138x110x2.bmp
diff --git a/apps/plugins/bitmaps/native/sudoku_inverse.320x240x16.bmp b/apps/plugins/bitmaps/native/sudoku_inverse.320x240x16.bmp
new file mode 100755
index 0000000000..2fdf3657ab
--- /dev/null
+++ b/apps/plugins/bitmaps/native/sudoku_inverse.320x240x16.bmp
diff --git a/apps/plugins/bitmaps/native/sudoku_normal.112x64x1.bmp b/apps/plugins/bitmaps/native/sudoku_normal.112x64x1.bmp
index 09b1342f94..54719a9ee8 100644
--- a/apps/plugins/bitmaps/native/sudoku_normal.112x64x1.bmp
+++ b/apps/plugins/bitmaps/native/sudoku_normal.112x64x1.bmp
diff --git a/apps/plugins/bitmaps/native/sudoku_normal.138x110x2.bmp b/apps/plugins/bitmaps/native/sudoku_normal.138x110x2.bmp
new file mode 100755
index 0000000000..2bce01b5bd
--- /dev/null
+++ b/apps/plugins/bitmaps/native/sudoku_normal.138x110x2.bmp
diff --git a/apps/plugins/bitmaps/native/sudoku_normal.320x240x16.bmp b/apps/plugins/bitmaps/native/sudoku_normal.320x240x16.bmp
new file mode 100755
index 0000000000..6f888cb86c
--- /dev/null
+++ b/apps/plugins/bitmaps/native/sudoku_normal.320x240x16.bmp
diff --git a/apps/plugins/bitmaps/native/sudoku_start.112x64x1.bmp b/apps/plugins/bitmaps/native/sudoku_start.112x64x1.bmp
index 09b1342f94..54719a9ee8 100644
--- a/apps/plugins/bitmaps/native/sudoku_start.112x64x1.bmp
+++ b/apps/plugins/bitmaps/native/sudoku_start.112x64x1.bmp
diff --git a/apps/plugins/bitmaps/native/sudoku_start.138x110x2.bmp b/apps/plugins/bitmaps/native/sudoku_start.138x110x2.bmp
new file mode 100755
index 0000000000..2d5aa76870
--- /dev/null
+++ b/apps/plugins/bitmaps/native/sudoku_start.138x110x2.bmp
diff --git a/apps/plugins/bitmaps/native/sudoku_start.320x240x16.bmp b/apps/plugins/bitmaps/native/sudoku_start.320x240x16.bmp
new file mode 100755
index 0000000000..bd4d7c4ee2
--- /dev/null
+++ b/apps/plugins/bitmaps/native/sudoku_start.320x240x16.bmp