diff options
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/bitmaps/native/SOURCES | 16 | ||||
-rw-r--r-- | apps/plugins/bitmaps/native/jewels.128x96x16.bmp | bin | 0 -> 9990 bytes | |||
-rw-r--r-- | apps/plugins/bitmaps/native/pegbox_header.128x16x16.bmp | bin | 0 -> 3126 bytes | |||
-rw-r--r-- | apps/plugins/bitmaps/native/sudoku_inverse.128x96x16.bmp | bin | 0 -> 1198 bytes | |||
-rw-r--r-- | apps/plugins/bitmaps/native/sudoku_normal.128x96x16.bmp | bin | 0 -> 1198 bytes | |||
-rw-r--r-- | apps/plugins/bitmaps/native/sudoku_start.128x96x16.bmp | bin | 0 -> 1198 bytes | |||
-rw-r--r-- | apps/plugins/pegbox.c | 24 | ||||
-rw-r--r-- | apps/plugins/sudoku/sudoku.c | 2 |
8 files changed, 35 insertions, 7 deletions
diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES index c91d694aea..6197f168e7 100644 --- a/apps/plugins/bitmaps/native/SOURCES +++ b/apps/plugins/bitmaps/native/SOURCES | |||
@@ -411,8 +411,10 @@ jewels.128x128x16.bmp | |||
411 | #elif ((LCD_WIDTH == 132) && (LCD_HEIGHT == 80)) || \ | 411 | #elif ((LCD_WIDTH == 132) && (LCD_HEIGHT == 80)) || \ |
412 | ((LCD_WIDTH == 96) && (LCD_HEIGHT == 96)) | 412 | ((LCD_WIDTH == 96) && (LCD_HEIGHT == 96)) |
413 | jewels.132x80x16.bmp | 413 | jewels.132x80x16.bmp |
414 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) | 414 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) && !defined(HAVE_LCD_COLOR) |
415 | jewels.128x96x2.bmp | 415 | jewels.128x96x2.bmp |
416 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) && defined(HAVE_LCD_COLOR) | ||
417 | jewels.128x96x16.bmp | ||
416 | #elif (LCD_WIDTH == 138) && (LCD_HEIGHT == 110) | 418 | #elif (LCD_WIDTH == 138) && (LCD_HEIGHT == 110) |
417 | jewels.138x110x2.bmp | 419 | jewels.138x110x2.bmp |
418 | #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && !defined(HAVE_LCD_COLOR) | 420 | #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && !defined(HAVE_LCD_COLOR) |
@@ -451,7 +453,7 @@ minesweeper_tiles.8x8x1.bmp | |||
451 | 453 | ||
452 | /* PegBox */ | 454 | /* PegBox */ |
453 | #ifdef HAVE_LCD_COLOR | 455 | #ifdef HAVE_LCD_COLOR |
454 | /* currently only LCD_WIDTH is important, e.g. Nano and e200 use the same set */ | 456 | /* for most targets only LCD_WIDTH is important, e.g. Nano and e200 use the same set */ |
455 | #if LCD_WIDTH >= 640 | 457 | #if LCD_WIDTH >= 640 |
456 | pegbox_pieces.48x48x16.bmp | 458 | pegbox_pieces.48x48x16.bmp |
457 | pegbox_header.640x80x16.bmp | 459 | pegbox_header.640x80x16.bmp |
@@ -475,7 +477,11 @@ pegbox_pieces.9x9x16.bmp | |||
475 | pegbox_header.22x80x16.bmp | 477 | pegbox_header.22x80x16.bmp |
476 | #elif LCD_WIDTH >= 128 | 478 | #elif LCD_WIDTH >= 128 |
477 | pegbox_pieces.10x10x16.bmp | 479 | pegbox_pieces.10x10x16.bmp |
480 | # if LCD_HEIGHT > 96 | ||
478 | pegbox_header.128x42x16.bmp | 481 | pegbox_header.128x42x16.bmp |
482 | # else | ||
483 | pegbox_header.128x16x16.bmp | ||
484 | # endif | ||
479 | #elif LCD_WIDTH >= 96 | 485 | #elif LCD_WIDTH >= 96 |
480 | pegbox_pieces.8x8x16.bmp | 486 | pegbox_pieces.8x8x16.bmp |
481 | pegbox_header.96x32x16.bmp | 487 | pegbox_header.96x32x16.bmp |
@@ -745,10 +751,14 @@ star_tiles.6x7x1.bmp | |||
745 | sudoku_start.112x64x1.bmp | 751 | sudoku_start.112x64x1.bmp |
746 | sudoku_normal.112x64x1.bmp | 752 | sudoku_normal.112x64x1.bmp |
747 | sudoku_inverse.112x64x1.bmp | 753 | sudoku_inverse.112x64x1.bmp |
748 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) && (LCD_DEPTH >= 2) | 754 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) && (LCD_DEPTH == 2) |
749 | sudoku_start.128x96x2.bmp | 755 | sudoku_start.128x96x2.bmp |
750 | sudoku_normal.128x96x2.bmp | 756 | sudoku_normal.128x96x2.bmp |
751 | sudoku_inverse.128x96x2.bmp | 757 | sudoku_inverse.128x96x2.bmp |
758 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) && (LCD_DEPTH == 16) | ||
759 | sudoku_start.128x96x16.bmp | ||
760 | sudoku_normal.128x96x16.bmp | ||
761 | sudoku_inverse.128x96x16.bmp | ||
752 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 128) && (LCD_DEPTH == 2) | 762 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 128) && (LCD_DEPTH == 2) |
753 | sudoku_start.128x128x2.bmp | 763 | sudoku_start.128x128x2.bmp |
754 | sudoku_normal.128x128x2.bmp | 764 | sudoku_normal.128x128x2.bmp |
diff --git a/apps/plugins/bitmaps/native/jewels.128x96x16.bmp b/apps/plugins/bitmaps/native/jewels.128x96x16.bmp new file mode 100644 index 0000000000..6d8447740f --- /dev/null +++ b/apps/plugins/bitmaps/native/jewels.128x96x16.bmp | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/native/pegbox_header.128x16x16.bmp b/apps/plugins/bitmaps/native/pegbox_header.128x16x16.bmp new file mode 100644 index 0000000000..7090b80f2e --- /dev/null +++ b/apps/plugins/bitmaps/native/pegbox_header.128x16x16.bmp | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/native/sudoku_inverse.128x96x16.bmp b/apps/plugins/bitmaps/native/sudoku_inverse.128x96x16.bmp new file mode 100644 index 0000000000..fc0333b7dd --- /dev/null +++ b/apps/plugins/bitmaps/native/sudoku_inverse.128x96x16.bmp | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/native/sudoku_normal.128x96x16.bmp b/apps/plugins/bitmaps/native/sudoku_normal.128x96x16.bmp new file mode 100644 index 0000000000..57915dd410 --- /dev/null +++ b/apps/plugins/bitmaps/native/sudoku_normal.128x96x16.bmp | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/native/sudoku_start.128x96x16.bmp b/apps/plugins/bitmaps/native/sudoku_start.128x96x16.bmp new file mode 100644 index 0000000000..0ff341c828 --- /dev/null +++ b/apps/plugins/bitmaps/native/sudoku_start.128x96x16.bmp | |||
Binary files differ | |||
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c index 19f3d529e6..f53c8f9519 100644 --- a/apps/plugins/pegbox.c +++ b/apps/plugins/pegbox.c | |||
@@ -414,8 +414,26 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
414 | 414 | ||
415 | #define QUIT_TEXT "POWER" | 415 | #define QUIT_TEXT "POWER" |
416 | 416 | ||
417 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 417 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD |
418 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | 418 | #define PEGBOX_SAVE BUTTON_FFWD |
419 | #define PEGBOX_QUIT BUTTON_REC | ||
420 | #define PEGBOX_RESTART BUTTON_REW | ||
421 | #define PEGBOX_LVL_UP (BUTTON_PLAY|BUTTON_FFWD) | ||
422 | #define PEGBOX_LVL_DOWN (BUTTON_PLAY|BUTTON_REW) | ||
423 | #define PEGBOX_UP BUTTON_UP | ||
424 | #define PEGBOX_DOWN BUTTON_DOWN | ||
425 | #define PEGBOX_RIGHT BUTTON_RIGHT | ||
426 | #define PEGBOX_LEFT BUTTON_LEFT | ||
427 | #define PEGBOX_SELECT BUTTON_PLAY | ||
428 | |||
429 | #define SAVE_TEXT "FFWD" | ||
430 | #define QUIT_TEXT "REC" | ||
431 | #define RESTART_TEXT "REW" | ||
432 | #define LVL_UP_TEXT "PLAY+FFWD" | ||
433 | #define LVL_DOWN_TEXT "PLAY+REW" | ||
434 | #define SELECT_TEXT "PLAY" | ||
435 | |||
436 | #elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD | ||
419 | #define PEGBOX_SAVE (BUTTON_REC|BUTTON_FFWD) | 437 | #define PEGBOX_SAVE (BUTTON_REC|BUTTON_FFWD) |
420 | #define PEGBOX_QUIT (BUTTON_REC|BUTTON_PLAY) | 438 | #define PEGBOX_QUIT (BUTTON_REC|BUTTON_PLAY) |
421 | #define PEGBOX_RESTART (BUTTON_REC|BUTTON_REW) | 439 | #define PEGBOX_RESTART (BUTTON_REC|BUTTON_REW) |
@@ -425,7 +443,7 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
425 | #define PEGBOX_DOWN BUTTON_DOWN | 443 | #define PEGBOX_DOWN BUTTON_DOWN |
426 | #define PEGBOX_RIGHT BUTTON_RIGHT | 444 | #define PEGBOX_RIGHT BUTTON_RIGHT |
427 | #define PEGBOX_LEFT BUTTON_LEFT | 445 | #define PEGBOX_LEFT BUTTON_LEFT |
428 | #define PEGBOX_SELECT BUTTON_PLAY | 446 | #define PEGBOX_SELECT BUTTON_PLAY |
429 | 447 | ||
430 | #define SAVE_TEXT "REC + FFWD" | 448 | #define SAVE_TEXT "REC + FFWD" |
431 | #define QUIT_TEXT "REC + PLAY" | 449 | #define QUIT_TEXT "REC + PLAY" |
diff --git a/apps/plugins/sudoku/sudoku.c b/apps/plugins/sudoku/sudoku.c index d19b556352..12880bd97b 100644 --- a/apps/plugins/sudoku/sudoku.c +++ b/apps/plugins/sudoku/sudoku.c | |||
@@ -114,7 +114,7 @@ static const char default_game[9][9] = | |||
114 | #define MARK_SIZE 1 /* Mark width and height */ | 114 | #define MARK_SIZE 1 /* Mark width and height */ |
115 | 115 | ||
116 | #elif ((LCD_HEIGHT==96) && (LCD_WIDTH==128)) | 116 | #elif ((LCD_HEIGHT==96) && (LCD_WIDTH==128)) |
117 | /* iAudio M3, 9 cells @ 9x9 with 14 border lines */ | 117 | /* iAudio M3, Samsung YH820, 9 cells @ 9x9 with 14 border lines */ |
118 | #define MARK_OFFS 1 /* Pixels between border and mark */ | 118 | #define MARK_OFFS 1 /* Pixels between border and mark */ |
119 | #define MARK_SPACE 2 /* Pixels between two marks */ | 119 | #define MARK_SPACE 2 /* Pixels between two marks */ |
120 | #define MARK_SIZE 1 /* Mark width and height */ | 120 | #define MARK_SIZE 1 /* Mark width and height */ |