From 912574b5f946ef8b0089288ff29fc515c6ce5e22 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Fri, 29 Sep 2006 20:39:29 +0000 Subject: 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 | 16 --------- .../bitmaps/mono/solitaire_numbers.6x6x1.bmp | Bin 374 -> 0 bytes .../bitmaps/mono/solitaire_numbers.8x10x1.bmp | Bin 582 -> 0 bytes .../plugins/bitmaps/mono/solitaire_suits.6x6x1.bmp | Bin 158 -> 0 bytes .../bitmaps/mono/solitaire_suits.8x10x1.bmp | Bin 222 -> 0 bytes .../bitmaps/mono/solitaire_suits.8x10x1_filled.bmp | Bin 222 -> 0 bytes .../bitmaps/mono/solitaire_suitsi.15x16x1.bmp | Bin 318 -> 0 bytes .../mono/solitaire_suitsi.15x16x1_filled.bmp | Bin 318 -> 0 bytes .../bitmaps/mono/solitaire_suitsi.9x9x1.bmp | Bin 206 -> 0 bytes apps/plugins/bitmaps/native/SOURCES | 36 ++++++++++++++++++--- .../bitmaps/native/solitaire_cardback.13x13x1.bmp | Bin 0 -> 114 bytes .../bitmaps/native/solitaire_cardback.15x20x16.bmp | Bin 0 -> 1014 bytes .../bitmaps/native/solitaire_cardback.15x20x2.bmp | Bin 0 -> 392 bytes .../native/solitaire_cardback.176x132x16.bmp | Bin 1398 -> 0 bytes .../bitmaps/native/solitaire_cardback.18x23x16.bmp | Bin 0 -> 1342 bytes .../bitmaps/native/solitaire_cardback.18x23x2.bmp | Bin 0 -> 532 bytes .../native/solitaire_cardback.220x176x16.bmp | Bin 2694 -> 0 bytes .../bitmaps/native/solitaire_cardback.26x33x16.bmp | Bin 0 -> 2694 bytes .../bitmaps/native/solitaire_cardback.37x49x16.bmp | Bin 0 -> 5542 bytes .../bitmaps/native/solitaire_deck.169x52x1.bmp | Bin 0 -> 1310 bytes .../bitmaps/native/solitaire_deck.195x80x16.bmp | Bin 0 -> 47094 bytes .../bitmaps/native/solitaire_deck.195x80x2.bmp | Bin 0 -> 15752 bytes .../bitmaps/native/solitaire_deck.234x92x16.bmp | Bin 0 -> 64822 bytes .../bitmaps/native/solitaire_deck.234x92x2.bmp | Bin 0 -> 21784 bytes .../bitmaps/native/solitaire_deck.338x132x16.bmp | Bin 0 -> 134166 bytes .../bitmaps/native/solitaire_deck.481x196x16.bmp | Bin 0 -> 283078 bytes .../bitmaps/native/solitaire_suitsi.13x52x1.bmp | Bin 0 -> 270 bytes .../bitmaps/native/solitaire_suitsi.15x80x16.bmp | Bin 0 -> 3894 bytes .../bitmaps/native/solitaire_suitsi.15x80x2.bmp | Bin 0 -> 1350 bytes .../bitmaps/native/solitaire_suitsi.18x92x16.bmp | Bin 0 -> 5206 bytes .../bitmaps/native/solitaire_suitsi.18x92x2.bmp | Bin 0 -> 1914 bytes .../bitmaps/native/solitaire_suitsi.26x132x16.bmp | Bin 0 -> 10614 bytes .../bitmaps/native/solitaire_suitsi.37x196x16.bmp | Bin 0 -> 22006 bytes 33 files changed, 32 insertions(+), 20 deletions(-) delete mode 100644 apps/plugins/bitmaps/mono/solitaire_numbers.6x6x1.bmp delete mode 100644 apps/plugins/bitmaps/mono/solitaire_numbers.8x10x1.bmp delete mode 100644 apps/plugins/bitmaps/mono/solitaire_suits.6x6x1.bmp delete mode 100644 apps/plugins/bitmaps/mono/solitaire_suits.8x10x1.bmp delete mode 100644 apps/plugins/bitmaps/mono/solitaire_suits.8x10x1_filled.bmp delete mode 100644 apps/plugins/bitmaps/mono/solitaire_suitsi.15x16x1.bmp delete mode 100644 apps/plugins/bitmaps/mono/solitaire_suitsi.15x16x1_filled.bmp delete mode 100755 apps/plugins/bitmaps/mono/solitaire_suitsi.9x9x1.bmp create mode 100755 apps/plugins/bitmaps/native/solitaire_cardback.13x13x1.bmp create mode 100755 apps/plugins/bitmaps/native/solitaire_cardback.15x20x16.bmp create mode 100755 apps/plugins/bitmaps/native/solitaire_cardback.15x20x2.bmp delete mode 100644 apps/plugins/bitmaps/native/solitaire_cardback.176x132x16.bmp create mode 100755 apps/plugins/bitmaps/native/solitaire_cardback.18x23x16.bmp create mode 100755 apps/plugins/bitmaps/native/solitaire_cardback.18x23x2.bmp delete mode 100644 apps/plugins/bitmaps/native/solitaire_cardback.220x176x16.bmp create mode 100755 apps/plugins/bitmaps/native/solitaire_cardback.26x33x16.bmp create mode 100755 apps/plugins/bitmaps/native/solitaire_cardback.37x49x16.bmp create mode 100755 apps/plugins/bitmaps/native/solitaire_deck.169x52x1.bmp create mode 100755 apps/plugins/bitmaps/native/solitaire_deck.195x80x16.bmp create mode 100755 apps/plugins/bitmaps/native/solitaire_deck.195x80x2.bmp create mode 100755 apps/plugins/bitmaps/native/solitaire_deck.234x92x16.bmp create mode 100755 apps/plugins/bitmaps/native/solitaire_deck.234x92x2.bmp create mode 100755 apps/plugins/bitmaps/native/solitaire_deck.338x132x16.bmp create mode 100755 apps/plugins/bitmaps/native/solitaire_deck.481x196x16.bmp create mode 100755 apps/plugins/bitmaps/native/solitaire_suitsi.13x52x1.bmp create mode 100755 apps/plugins/bitmaps/native/solitaire_suitsi.15x80x16.bmp create mode 100755 apps/plugins/bitmaps/native/solitaire_suitsi.15x80x2.bmp create mode 100755 apps/plugins/bitmaps/native/solitaire_suitsi.18x92x16.bmp create mode 100755 apps/plugins/bitmaps/native/solitaire_suitsi.18x92x2.bmp create mode 100755 apps/plugins/bitmaps/native/solitaire_suitsi.26x132x16.bmp create mode 100755 apps/plugins/bitmaps/native/solitaire_suitsi.37x196x16.bmp (limited to 'apps/plugins/bitmaps') diff --git a/apps/plugins/bitmaps/mono/SOURCES b/apps/plugins/bitmaps/mono/SOURCES index e6ccebb9ce..9dfc312348 100644 --- a/apps/plugins/bitmaps/mono/SOURCES +++ b/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 */ diff --git a/apps/plugins/bitmaps/mono/solitaire_numbers.6x6x1.bmp b/apps/plugins/bitmaps/mono/solitaire_numbers.6x6x1.bmp deleted file mode 100644 index 67884fe741..0000000000 Binary files a/apps/plugins/bitmaps/mono/solitaire_numbers.6x6x1.bmp and /dev/null differ diff --git a/apps/plugins/bitmaps/mono/solitaire_numbers.8x10x1.bmp b/apps/plugins/bitmaps/mono/solitaire_numbers.8x10x1.bmp deleted file mode 100644 index 228532b54b..0000000000 Binary files a/apps/plugins/bitmaps/mono/solitaire_numbers.8x10x1.bmp and /dev/null differ diff --git a/apps/plugins/bitmaps/mono/solitaire_suits.6x6x1.bmp b/apps/plugins/bitmaps/mono/solitaire_suits.6x6x1.bmp deleted file mode 100644 index 67ec92e113..0000000000 Binary files a/apps/plugins/bitmaps/mono/solitaire_suits.6x6x1.bmp and /dev/null differ diff --git a/apps/plugins/bitmaps/mono/solitaire_suits.8x10x1.bmp b/apps/plugins/bitmaps/mono/solitaire_suits.8x10x1.bmp deleted file mode 100644 index 444a63e0a0..0000000000 Binary files a/apps/plugins/bitmaps/mono/solitaire_suits.8x10x1.bmp and /dev/null differ diff --git a/apps/plugins/bitmaps/mono/solitaire_suits.8x10x1_filled.bmp b/apps/plugins/bitmaps/mono/solitaire_suits.8x10x1_filled.bmp deleted file mode 100644 index 497dcae149..0000000000 Binary files a/apps/plugins/bitmaps/mono/solitaire_suits.8x10x1_filled.bmp and /dev/null differ diff --git a/apps/plugins/bitmaps/mono/solitaire_suitsi.15x16x1.bmp b/apps/plugins/bitmaps/mono/solitaire_suitsi.15x16x1.bmp deleted file mode 100644 index a47fe1837c..0000000000 Binary files a/apps/plugins/bitmaps/mono/solitaire_suitsi.15x16x1.bmp and /dev/null differ diff --git a/apps/plugins/bitmaps/mono/solitaire_suitsi.15x16x1_filled.bmp b/apps/plugins/bitmaps/mono/solitaire_suitsi.15x16x1_filled.bmp deleted file mode 100644 index 272fde5604..0000000000 Binary files a/apps/plugins/bitmaps/mono/solitaire_suitsi.15x16x1_filled.bmp and /dev/null differ diff --git a/apps/plugins/bitmaps/mono/solitaire_suitsi.9x9x1.bmp b/apps/plugins/bitmaps/mono/solitaire_suitsi.9x9x1.bmp deleted file mode 100755 index c08e7f9c11..0000000000 Binary files a/apps/plugins/bitmaps/mono/solitaire_suitsi.9x9x1.bmp and /dev/null differ diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES index ad1de51eee..c5729a09b7 100644 --- a/apps/plugins/bitmaps/native/SOURCES +++ b/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 diff --git a/apps/plugins/bitmaps/native/solitaire_cardback.13x13x1.bmp b/apps/plugins/bitmaps/native/solitaire_cardback.13x13x1.bmp new file mode 100755 index 0000000000..b06511538f Binary files /dev/null and b/apps/plugins/bitmaps/native/solitaire_cardback.13x13x1.bmp differ diff --git a/apps/plugins/bitmaps/native/solitaire_cardback.15x20x16.bmp b/apps/plugins/bitmaps/native/solitaire_cardback.15x20x16.bmp new file mode 100755 index 0000000000..d18894270b Binary files /dev/null and b/apps/plugins/bitmaps/native/solitaire_cardback.15x20x16.bmp differ diff --git a/apps/plugins/bitmaps/native/solitaire_cardback.15x20x2.bmp b/apps/plugins/bitmaps/native/solitaire_cardback.15x20x2.bmp new file mode 100755 index 0000000000..72704faa1d Binary files /dev/null and b/apps/plugins/bitmaps/native/solitaire_cardback.15x20x2.bmp differ diff --git a/apps/plugins/bitmaps/native/solitaire_cardback.176x132x16.bmp b/apps/plugins/bitmaps/native/solitaire_cardback.176x132x16.bmp deleted file mode 100644 index a3377149b5..0000000000 Binary files a/apps/plugins/bitmaps/native/solitaire_cardback.176x132x16.bmp and /dev/null differ diff --git a/apps/plugins/bitmaps/native/solitaire_cardback.18x23x16.bmp b/apps/plugins/bitmaps/native/solitaire_cardback.18x23x16.bmp new file mode 100755 index 0000000000..7745ead6d8 Binary files /dev/null and b/apps/plugins/bitmaps/native/solitaire_cardback.18x23x16.bmp differ diff --git a/apps/plugins/bitmaps/native/solitaire_cardback.18x23x2.bmp b/apps/plugins/bitmaps/native/solitaire_cardback.18x23x2.bmp new file mode 100755 index 0000000000..e033af02ee Binary files /dev/null and b/apps/plugins/bitmaps/native/solitaire_cardback.18x23x2.bmp differ diff --git a/apps/plugins/bitmaps/native/solitaire_cardback.220x176x16.bmp b/apps/plugins/bitmaps/native/solitaire_cardback.220x176x16.bmp deleted file mode 100644 index 1810d18ce3..0000000000 Binary files a/apps/plugins/bitmaps/native/solitaire_cardback.220x176x16.bmp and /dev/null differ diff --git a/apps/plugins/bitmaps/native/solitaire_cardback.26x33x16.bmp b/apps/plugins/bitmaps/native/solitaire_cardback.26x33x16.bmp new file mode 100755 index 0000000000..97351cde00 Binary files /dev/null and b/apps/plugins/bitmaps/native/solitaire_cardback.26x33x16.bmp differ diff --git a/apps/plugins/bitmaps/native/solitaire_cardback.37x49x16.bmp b/apps/plugins/bitmaps/native/solitaire_cardback.37x49x16.bmp new file mode 100755 index 0000000000..8f192ca10c Binary files /dev/null and b/apps/plugins/bitmaps/native/solitaire_cardback.37x49x16.bmp differ diff --git a/apps/plugins/bitmaps/native/solitaire_deck.169x52x1.bmp b/apps/plugins/bitmaps/native/solitaire_deck.169x52x1.bmp new file mode 100755 index 0000000000..b7ceccbe93 Binary files /dev/null and b/apps/plugins/bitmaps/native/solitaire_deck.169x52x1.bmp differ diff --git a/apps/plugins/bitmaps/native/solitaire_deck.195x80x16.bmp b/apps/plugins/bitmaps/native/solitaire_deck.195x80x16.bmp new file mode 100755 index 0000000000..bb3a6ff5a7 Binary files /dev/null and b/apps/plugins/bitmaps/native/solitaire_deck.195x80x16.bmp differ diff --git a/apps/plugins/bitmaps/native/solitaire_deck.195x80x2.bmp b/apps/plugins/bitmaps/native/solitaire_deck.195x80x2.bmp new file mode 100755 index 0000000000..d6247d8537 Binary files /dev/null and b/apps/plugins/bitmaps/native/solitaire_deck.195x80x2.bmp differ diff --git a/apps/plugins/bitmaps/native/solitaire_deck.234x92x16.bmp b/apps/plugins/bitmaps/native/solitaire_deck.234x92x16.bmp new file mode 100755 index 0000000000..9af3236b6c Binary files /dev/null and b/apps/plugins/bitmaps/native/solitaire_deck.234x92x16.bmp differ diff --git a/apps/plugins/bitmaps/native/solitaire_deck.234x92x2.bmp b/apps/plugins/bitmaps/native/solitaire_deck.234x92x2.bmp new file mode 100755 index 0000000000..f03fe558b5 Binary files /dev/null and b/apps/plugins/bitmaps/native/solitaire_deck.234x92x2.bmp differ diff --git a/apps/plugins/bitmaps/native/solitaire_deck.338x132x16.bmp b/apps/plugins/bitmaps/native/solitaire_deck.338x132x16.bmp new file mode 100755 index 0000000000..32a517a90d Binary files /dev/null and b/apps/plugins/bitmaps/native/solitaire_deck.338x132x16.bmp differ diff --git a/apps/plugins/bitmaps/native/solitaire_deck.481x196x16.bmp b/apps/plugins/bitmaps/native/solitaire_deck.481x196x16.bmp new file mode 100755 index 0000000000..89af51d059 Binary files /dev/null and b/apps/plugins/bitmaps/native/solitaire_deck.481x196x16.bmp differ diff --git a/apps/plugins/bitmaps/native/solitaire_suitsi.13x52x1.bmp b/apps/plugins/bitmaps/native/solitaire_suitsi.13x52x1.bmp new file mode 100755 index 0000000000..ba9ac412a9 Binary files /dev/null and b/apps/plugins/bitmaps/native/solitaire_suitsi.13x52x1.bmp differ diff --git a/apps/plugins/bitmaps/native/solitaire_suitsi.15x80x16.bmp b/apps/plugins/bitmaps/native/solitaire_suitsi.15x80x16.bmp new file mode 100755 index 0000000000..0363cc8bf8 Binary files /dev/null and b/apps/plugins/bitmaps/native/solitaire_suitsi.15x80x16.bmp differ diff --git a/apps/plugins/bitmaps/native/solitaire_suitsi.15x80x2.bmp b/apps/plugins/bitmaps/native/solitaire_suitsi.15x80x2.bmp new file mode 100755 index 0000000000..6adc65a0ca Binary files /dev/null and b/apps/plugins/bitmaps/native/solitaire_suitsi.15x80x2.bmp differ diff --git a/apps/plugins/bitmaps/native/solitaire_suitsi.18x92x16.bmp b/apps/plugins/bitmaps/native/solitaire_suitsi.18x92x16.bmp new file mode 100755 index 0000000000..8f516fc56d Binary files /dev/null and b/apps/plugins/bitmaps/native/solitaire_suitsi.18x92x16.bmp differ diff --git a/apps/plugins/bitmaps/native/solitaire_suitsi.18x92x2.bmp b/apps/plugins/bitmaps/native/solitaire_suitsi.18x92x2.bmp new file mode 100755 index 0000000000..0ca00a00c3 Binary files /dev/null and b/apps/plugins/bitmaps/native/solitaire_suitsi.18x92x2.bmp differ diff --git a/apps/plugins/bitmaps/native/solitaire_suitsi.26x132x16.bmp b/apps/plugins/bitmaps/native/solitaire_suitsi.26x132x16.bmp new file mode 100755 index 0000000000..1fe15b0ba6 Binary files /dev/null and b/apps/plugins/bitmaps/native/solitaire_suitsi.26x132x16.bmp differ diff --git a/apps/plugins/bitmaps/native/solitaire_suitsi.37x196x16.bmp b/apps/plugins/bitmaps/native/solitaire_suitsi.37x196x16.bmp new file mode 100755 index 0000000000..6655763104 Binary files /dev/null and b/apps/plugins/bitmaps/native/solitaire_suitsi.37x196x16.bmp differ -- cgit v1.2.3