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/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 24 files changed, 32 insertions(+), 4 deletions(-) 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/native') diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES index ad1de51..c5729a0 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 0000000..b065115 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 0000000..d188942 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 0000000..72704fa 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 a337714..0000000 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 0000000..7745ead 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 0000000..e033af0 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 1810d18..0000000 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 0000000..97351cd 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 0000000..8f192ca 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 0000000..b7ceccb 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 0000000..bb3a6ff 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 0000000..d6247d8 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 0000000..9af3236 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 0000000..f03fe55 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 0000000..32a517a 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 0000000..89af51d 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 0000000..ba9ac41 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 0000000..0363cc8 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 0000000..6adc65a 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 0000000..8f516fc 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 0000000..0ca00a0 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 0000000..1fe15b0 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 0000000..6655763 Binary files /dev/null and b/apps/plugins/bitmaps/native/solitaire_suitsi.37x196x16.bmp differ -- cgit v1.1