Heavy graphical rework of solitaire: * Now uses full-card bitmaps (minus border) in several resolutions and colour depths. All graphical work done by Marianne Arnold; 37x49 and 26x33 pixel graphics partially based on the PySol cardset adapted from kdegames 1.0 * Cardback for greyscale targets. * Nicer edges for large cards. * Correct vertical card spacing within columns, hidden cards always use half the space now. * Correct horizontal spacing of columns.

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

apps/plugins/bitmaps/mono/SOURCES

@@ -32,20 +32,4 @@ brickmania_powerups.112x64x1.bmp
 rockblox_background.112x64x1.bmp
 #endif
 
-/* Solitaire */
-#if LCD_HEIGHT > 64
-solitaire_numbers.8x10x1.bmp
-#if HAVE_LCD_COLOR
-solitaire_suits.8x10x1_filled.bmp
-solitaire_suitsi.15x16x1_filled.bmp
-#else
-solitaire_suits.8x10x1.bmp
-solitaire_suitsi.15x16x1.bmp
-#endif
-#else
-solitaire_numbers.6x6x1.bmp
-solitaire_suits.6x6x1.bmp
-solitaire_suitsi.9x9x1.bmp
-#endif
-
 #endif /* HAVE_LCD_BITMAP */

apps/plugins/bitmaps/native/SOURCES

@@ -157,10 +157,38 @@ star_tiles.10x10.grey.bmp
 
 /* Solitaire */
 #ifdef HAVE_LCD_COLOR
-#if (LCD_WIDTH >= 220) && (LCD_HEIGHT >= 176)
-solitaire_cardback.220x176x16.bmp
-#else
-solitaire_cardback.176x132x16.bmp
+#if LCD_WIDTH >= 320
+solitaire_cardback.37x49x16.bmp
+solitaire_deck.481x196x16.bmp
+solitaire_suitsi.37x196x16.bmp
+#elif LCD_WIDTH >= 220
+solitaire_cardback.26x33x16.bmp
+solitaire_deck.338x132x16.bmp
+solitaire_suitsi.26x132x16.bmp
+#elif LCD_WIDTH >= 160
+solitaire_cardback.18x23x16.bmp
+solitaire_deck.234x92x16.bmp
+solitaire_suitsi.18x92x16.bmp
+#elif LCD_WIDTH >= 128
+solitaire_cardback.15x20x16.bmp
+solitaire_deck.195x80x16.bmp
+solitaire_suitsi.15x80x16.bmp
+#endif
+#elif LCD_DEPTH > 1 /* greyscale */
+#if LCD_WIDTH >= 160
+solitaire_cardback.18x23x2.bmp
+solitaire_deck.234x92x2.bmp
+solitaire_suitsi.18x92x2.bmp
+#elif LCD_WIDTH >= 128
+solitaire_cardback.15x20x2.bmp
+solitaire_deck.195x80x2.bmp
+solitaire_suitsi.15x80x2.bmp
+#endif
+#else /* monochrome */
+#if LCD_WIDTH >= 112
+solitaire_cardback.13x13x1.bmp
+solitaire_deck.169x52x1.bmp
+solitaire_suitsi.13x52x1.bmp
 #endif
 #endif