diff options
author | Jens Arnold <amiconn@rockbox.org> | 2006-09-29 20:39:29 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2006-09-29 20:39:29 +0000 |
commit | 912574b5f946ef8b0089288ff29fc515c6ce5e22 (patch) | |
tree | 8b65d67f15a9a7ce66ed8805e6e93bc0bead0652 /apps/plugins/bitmaps | |
parent | ce74dc074355dcf8db9bd0c09ee2624089d3c3e7 (diff) | |
download | rockbox-912574b5f946ef8b0089288ff29fc515c6ce5e22.tar.gz rockbox-912574b5f946ef8b0089288ff29fc515c6ce5e22.zip |
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
Diffstat (limited to 'apps/plugins/bitmaps')
32 files changed, 32 insertions, 20 deletions
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 | |||
32 | rockblox_background.112x64x1.bmp | 32 | rockblox_background.112x64x1.bmp |
33 | #endif | 33 | #endif |
34 | 34 | ||
35 | /* Solitaire */ | ||
36 | #if LCD_HEIGHT > 64 | ||
37 | solitaire_numbers.8x10x1.bmp | ||
38 | #if HAVE_LCD_COLOR | ||
39 | solitaire_suits.8x10x1_filled.bmp | ||
40 | solitaire_suitsi.15x16x1_filled.bmp | ||
41 | #else | ||
42 | solitaire_suits.8x10x1.bmp | ||
43 | solitaire_suitsi.15x16x1.bmp | ||
44 | #endif | ||
45 | #else | ||
46 | solitaire_numbers.6x6x1.bmp | ||
47 | solitaire_suits.6x6x1.bmp | ||
48 | solitaire_suitsi.9x9x1.bmp | ||
49 | #endif | ||
50 | |||
51 | #endif /* HAVE_LCD_BITMAP */ | 35 | #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 --- a/apps/plugins/bitmaps/mono/solitaire_numbers.6x6x1.bmp +++ /dev/null | |||
Binary files 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 --- a/apps/plugins/bitmaps/mono/solitaire_numbers.8x10x1.bmp +++ /dev/null | |||
Binary files 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 --- a/apps/plugins/bitmaps/mono/solitaire_suits.6x6x1.bmp +++ /dev/null | |||
Binary files 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 --- a/apps/plugins/bitmaps/mono/solitaire_suits.8x10x1.bmp +++ /dev/null | |||
Binary files 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 --- a/apps/plugins/bitmaps/mono/solitaire_suits.8x10x1_filled.bmp +++ /dev/null | |||
Binary files 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 --- a/apps/plugins/bitmaps/mono/solitaire_suitsi.15x16x1.bmp +++ /dev/null | |||
Binary files 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 --- a/apps/plugins/bitmaps/mono/solitaire_suitsi.15x16x1_filled.bmp +++ /dev/null | |||
Binary files 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 --- a/apps/plugins/bitmaps/mono/solitaire_suitsi.9x9x1.bmp +++ /dev/null | |||
Binary files 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 | |||
157 | 157 | ||
158 | /* Solitaire */ | 158 | /* Solitaire */ |
159 | #ifdef HAVE_LCD_COLOR | 159 | #ifdef HAVE_LCD_COLOR |
160 | #if (LCD_WIDTH >= 220) && (LCD_HEIGHT >= 176) | 160 | #if LCD_WIDTH >= 320 |
161 | solitaire_cardback.220x176x16.bmp | 161 | solitaire_cardback.37x49x16.bmp |
162 | #else | 162 | solitaire_deck.481x196x16.bmp |
163 | solitaire_cardback.176x132x16.bmp | 163 | solitaire_suitsi.37x196x16.bmp |
164 | #elif LCD_WIDTH >= 220 | ||
165 | solitaire_cardback.26x33x16.bmp | ||
166 | solitaire_deck.338x132x16.bmp | ||
167 | solitaire_suitsi.26x132x16.bmp | ||
168 | #elif LCD_WIDTH >= 160 | ||
169 | solitaire_cardback.18x23x16.bmp | ||
170 | solitaire_deck.234x92x16.bmp | ||
171 | solitaire_suitsi.18x92x16.bmp | ||
172 | #elif LCD_WIDTH >= 128 | ||
173 | solitaire_cardback.15x20x16.bmp | ||
174 | solitaire_deck.195x80x16.bmp | ||
175 | solitaire_suitsi.15x80x16.bmp | ||
176 | #endif | ||
177 | #elif LCD_DEPTH > 1 /* greyscale */ | ||
178 | #if LCD_WIDTH >= 160 | ||
179 | solitaire_cardback.18x23x2.bmp | ||
180 | solitaire_deck.234x92x2.bmp | ||
181 | solitaire_suitsi.18x92x2.bmp | ||
182 | #elif LCD_WIDTH >= 128 | ||
183 | solitaire_cardback.15x20x2.bmp | ||
184 | solitaire_deck.195x80x2.bmp | ||
185 | solitaire_suitsi.15x80x2.bmp | ||
186 | #endif | ||
187 | #else /* monochrome */ | ||
188 | #if LCD_WIDTH >= 112 | ||
189 | solitaire_cardback.13x13x1.bmp | ||
190 | solitaire_deck.169x52x1.bmp | ||
191 | solitaire_suitsi.13x52x1.bmp | ||
164 | #endif | 192 | #endif |
165 | #endif | 193 | #endif |
166 | 194 | ||
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 --- /dev/null +++ b/apps/plugins/bitmaps/native/solitaire_cardback.13x13x1.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/solitaire_cardback.15x20x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/solitaire_cardback.15x20x2.bmp | |||
Binary files 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 --- a/apps/plugins/bitmaps/native/solitaire_cardback.176x132x16.bmp +++ /dev/null | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/solitaire_cardback.18x23x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/solitaire_cardback.18x23x2.bmp | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/native/solitaire_cardback.220x176x16.bmp b/apps/plugins/bitmaps/native/solitaire_cardback.26x33x16.bmp index 1810d18ce3..97351cde00 100644..100755 --- a/apps/plugins/bitmaps/native/solitaire_cardback.220x176x16.bmp +++ b/apps/plugins/bitmaps/native/solitaire_cardback.26x33x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/solitaire_cardback.37x49x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/solitaire_deck.169x52x1.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/solitaire_deck.195x80x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/solitaire_deck.195x80x2.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/solitaire_deck.234x92x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/solitaire_deck.234x92x2.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/solitaire_deck.338x132x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/solitaire_deck.481x196x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/solitaire_suitsi.13x52x1.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/solitaire_suitsi.15x80x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/solitaire_suitsi.15x80x2.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/solitaire_suitsi.18x92x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/solitaire_suitsi.18x92x2.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/solitaire_suitsi.26x132x16.bmp | |||
Binary files 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 --- /dev/null +++ b/apps/plugins/bitmaps/native/solitaire_suitsi.37x196x16.bmp | |||
Binary files differ | |||