23 files changed, 32 insertions, 4 deletions

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
--- /dev/null
+++ b/apps/plugins/bitmaps/native/solitaire_cardback.13x13x1.bmp
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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