Index: apps/plugins/flipit.c =================================================================== --- apps/plugins/flipit.c (revision 16000) +++ apps/plugins/flipit.c (working copy) @@ -110,8 +110,8 @@ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ (CONFIG_KEYPAD == SANSA_C200_PAD) -#define FLIPIT_UP BUTTON_UP -#define FLIPIT_DOWN BUTTON_DOWN +#define FLIPIT_UP BUTTON_SCROLL_UP +#define FLIPIT_DOWN BUTTON_SCROLL_DOWN #define FLIPIT_QUIT BUTTON_POWER #define FLIPIT_SHUFFLE (BUTTON_REC | BUTTON_LEFT) #define FLIPIT_SOLVE (BUTTON_REC | BUTTON_RIGHT) Index: apps/plugins/chessbox/chessbox.c =================================================================== --- apps/plugins/chessbox/chessbox.c (revision 16000) +++ apps/plugins/chessbox/chessbox.c (working copy) @@ -7,7 +7,7 @@ * \/ \/ \/ \/ \/ * $Id$ * -* Copyright (C) 2006 Miguel A. Ar�valo +* Copyright (C) 2006 Miguel A. Ar�valo * Color graphics from eboard * GNUChess v2 chess engine Copyright (c) 1988 John Stanback * @@ -183,8 +183,8 @@ #elif CONFIG_KEYPAD == SANSA_E200_PAD #define CB_SELECT BUTTON_SELECT -#define CB_UP BUTTON_UP -#define CB_DOWN BUTTON_DOWN +#define CB_UP BUTTON_SCROLL_UP +#define CB_DOWN BUTTON_SCROLL_DOWN #define CB_LEFT BUTTON_LEFT #define CB_RIGHT BUTTON_RIGHT #define CB_PLAY (BUTTON_SELECT | BUTTON_RIGHT) Index: apps/plugins/rockblox.c =================================================================== --- apps/plugins/rockblox.c (revision 16000) +++ apps/plugins/rockblox.c (working copy) @@ -9,7 +9,7 @@ * * Copyright (C) 2005 Eli Sherer * - * Heavily modified for embedded use by Bj�rn Stenberg (bjorn@haxx.se) + * Heavily modified for embedded use by Bj�rn Stenberg (bjorn@haxx.se) * * All files in this archive are subject to the GNU General Public License. * See the file COPYING in the source tree root for full license agreement. @@ -113,12 +113,10 @@ #elif CONFIG_KEYPAD == SANSA_E200_PAD #define ROCKBLOX_OFF BUTTON_POWER -#define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_UP -#define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_DOWN -#define ROCKBLOX_DOWN BUTTON_DOWN -#define ROCKBLOX_LEFT BUTTON_LEFT -#define ROCKBLOX_RIGHT BUTTON_RIGHT -#define ROCKBLOX_DROP BUTTON_SELECT +#define ROCKBLOX_ROTATE_RIGHT BUTTON_SELECT +#define ROCKBLOX_LEFT BUTTON_SCROLL_UP +#define ROCKBLOX_RIGHT BUTTON_SCROLL_DOWN +#define ROCKBLOX_DROP BUTTON_DOWN #define ROCKBLOX_RESTART BUTTON_REC #elif CONFIG_KEYPAD == SANSA_C200_PAD Index: apps/plugins/jpeg.c =================================================================== --- apps/plugins/jpeg.c (revision 16000) +++ apps/plugins/jpeg.c (working copy) @@ -11,7 +11,7 @@ * (This is a real mess if it has to be coded in one single C file) * * File scrolling addition (C) 2005 Alexander Spyridakis -* Copyright (C) 2004 J�rg Hohensohn aka [IDC]Dragon +* Copyright (C) 2004 J�rg Hohensohn aka [IDC]Dragon * Heavily borrowed from the IJG implementation (C) Thomas G. Lane * Small & fast downscaling IDCT (C) 2002 by Guido Vollbeding JPEGclub.org * @@ -130,16 +130,14 @@ #define JPEG_ZOOM_PRE BUTTON_SELECT #define JPEG_ZOOM_IN (BUTTON_SELECT | BUTTON_REL) #define JPEG_ZOOM_OUT (BUTTON_SELECT | BUTTON_REPEAT) -#define JPEG_UP BUTTON_UP -#define JPEG_DOWN BUTTON_DOWN +#define JPEG_UP BUTTON_SCROLL_UP +#define JPEG_DOWN BUTTON_SCROLL_DOWN #define JPEG_LEFT BUTTON_LEFT #define JPEG_RIGHT BUTTON_RIGHT #define JPEG_MENU BUTTON_POWER #define JPEG_SLIDE_SHOW BUTTON_REC -#define JPEG_NEXT BUTTON_SCROLL_DOWN -#define JPEG_NEXT_REPEAT (BUTTON_SCROLL_DOWN|BUTTON_REPEAT) -#define JPEG_PREVIOUS BUTTON_SCROLL_UP -#define JPEG_PREVIOUS_REPEAT (BUTTON_SCROLL_UP|BUTTON_REPEAT) +#define JPEG_NEXT BUTTON_UP +#define JPEG_PREVIOUS BUTTON_DOWN #elif CONFIG_KEYPAD == SANSA_C200_PAD #define JPEG_ZOOM_PRE BUTTON_SELECT Index: apps/plugins/sokoban.c =================================================================== --- apps/plugins/sokoban.c (revision 16000) +++ apps/plugins/sokoban.c (working copy) @@ -204,8 +204,8 @@ #define BUTTON_SAVE_NAME "SELECT" #elif CONFIG_KEYPAD == SANSA_E200_PAD -#define SOKOBAN_UP BUTTON_UP -#define SOKOBAN_DOWN BUTTON_DOWN +#define SOKOBAN_UP BUTTON_SCROLL_UP +#define SOKOBAN_DOWN BUTTON_SCROLL_DOWN #define SOKOBAN_MENU BUTTON_POWER #define SOKOBAN_UNDO_PRE BUTTON_SELECT #define SOKOBAN_UNDO (BUTTON_SELECT | BUTTON_REL) Index: apps/plugins/viewer.c =================================================================== --- apps/plugins/viewer.c (revision 16000) +++ apps/plugins/viewer.c (working copy) @@ -174,14 +174,14 @@ /* Sansa E200 keys */ #elif CONFIG_KEYPAD == SANSA_E200_PAD #define VIEWER_QUIT BUTTON_POWER -#define VIEWER_PAGE_UP BUTTON_UP -#define VIEWER_PAGE_DOWN BUTTON_DOWN +#define VIEWER_PAGE_UP BUTTON_SCROLL_UP +#define VIEWER_PAGE_DOWN BUTTON_SCROLL_DOWN #define VIEWER_SCREEN_LEFT BUTTON_LEFT #define VIEWER_SCREEN_RIGHT BUTTON_RIGHT #define VIEWER_MENU BUTTON_SELECT #define VIEWER_AUTOSCROLL BUTTON_REC -#define VIEWER_LINE_UP BUTTON_SCROLL_UP -#define VIEWER_LINE_DOWN BUTTON_SCROLL_DOWN +#define VIEWER_LINE_UP BUTTON_UP +#define VIEWER_LINE_DOWN BUTTON_DOWN /* Sansa C200 keys */ #elif CONFIG_KEYPAD == SANSA_C200_PAD Index: apps/plugins/mazezam.c =================================================================== --- apps/plugins/mazezam.c (revision 16000) +++ apps/plugins/mazezam.c (working copy) @@ -118,8 +118,8 @@ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ (CONFIG_KEYPAD == SANSA_C200_PAD) -#define MAZEZAM_UP BUTTON_UP -#define MAZEZAM_DOWN BUTTON_DOWN +#define MAZEZAM_UP BUTTON_SCROLL_UP +#define MAZEZAM_DOWN BUTTON_SCROLL_DOWN #define MAZEZAM_LEFT BUTTON_LEFT #define MAZEZAM_RIGHT BUTTON_RIGHT #define MAZEZAM_SELECT BUTTON_SELECT Index: apps/plugins/jewels.c =================================================================== --- apps/plugins/jewels.c (revision 16000) +++ apps/plugins/jewels.c (working copy) @@ -97,8 +97,8 @@ #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ (CONFIG_KEYPAD == SANSA_C200_PAD) -#define JEWELS_UP BUTTON_UP -#define JEWELS_DOWN BUTTON_DOWN +#define JEWELS_UP BUTTON_SCROLL_UP +#define JEWELS_DOWN BUTTON_SCROLL_DOWN #define JEWELS_LEFT BUTTON_LEFT #define JEWELS_RIGHT BUTTON_RIGHT #define JEWELS_SELECT BUTTON_SELECT Index: apps/plugins/invadrox.c =================================================================== --- apps/plugins/invadrox.c (revision 16000) +++ apps/plugins/invadrox.c (working copy) @@ -95,8 +95,8 @@ #elif CONFIG_KEYPAD == SANSA_E200_PAD #define QUIT BUTTON_POWER -#define LEFT BUTTON_LEFT -#define RIGHT BUTTON_RIGHT +#define LEFT BUTTON_SCROLL_BACK +#define RIGHT BUTTON_SCROLL_FORWARD #define FIRE BUTTON_SELECT #elif CONFIG_KEYPAD == ELIO_TPJ1022_PAD Index: apps/plugins/rockpaint.c =================================================================== --- apps/plugins/rockpaint.c (revision 16000) +++ apps/plugins/rockpaint.c (working copy) @@ -89,8 +89,8 @@ #define ROCKPAINT_MENU ( BUTTON_SELECT | BUTTON_POWER ) #define ROCKPAINT_TOOLBAR BUTTON_REC #define ROCKPAINT_TOOLBAR2 ( BUTTON_REC | BUTTON_LEFT ) -#define ROCKPAINT_UP BUTTON_UP -#define ROCKPAINT_DOWN BUTTON_DOWN +#define ROCKPAINT_UP BUTTON_SCROLL_UP +#define ROCKPAINT_DOWN BUTTON_SCROLL_DOWN #define ROCKPAINT_LEFT BUTTON_LEFT #define ROCKPAINT_RIGHT BUTTON_RIGHT @@ -503,9 +503,9 @@ { SELECT_MENU_INVERT, "Invert" }, { SELECT_MENU_HFLIP, "Horizontal flip" }, { SELECT_MENU_VFLIP, "Vertical flip" }, -// { SELECT_MENU_ROTATE90, "Rotate 90�" }, - { SELECT_MENU_ROTATE180, "Rotate 180�" }, -// { SELECT_MENU_ROTATE270, "Rotate 270�" }, +// { SELECT_MENU_ROTATE90, "Rotate 90�" }, + { SELECT_MENU_ROTATE180, "Rotate 180�" }, +// { SELECT_MENU_ROTATE270, "Rotate 270�" }, { SELECT_MENU_CANCEL, "Cancel" }, { MENU_END, "" } };