[Fuze+] imageviewer: update/complete keymaps

1) update/complete keymaps (now handle slideshow)
2) update/complete manual

Change-Id: I1baf2598941bb781a2f2777f23eb543bd6bf5848
Reviewed-on: http://gerrit.rockbox.org/354
Reviewed-by: Amaury Pouly <amaury.pouly@gmail.com>
This commit is contained in:
Jean-Louis Biasini 2012-11-21 22:40:22 +02:00 committed by Amaury Pouly
parent 0f0adfac71
commit 5caaf70f34
2 changed files with 17 additions and 10 deletions

View file

@ -359,10 +359,11 @@
#define IMGVIEW_DOWN BUTTON_DOWN #define IMGVIEW_DOWN BUTTON_DOWN
#define IMGVIEW_LEFT BUTTON_LEFT #define IMGVIEW_LEFT BUTTON_LEFT
#define IMGVIEW_RIGHT BUTTON_RIGHT #define IMGVIEW_RIGHT BUTTON_RIGHT
#define IMGVIEW_NEXT BUTTON_PLAYPAUSE #define IMGVIEW_NEXT BUTTON_BOTTOMRIGHT
#define IMGVIEW_PREVIOUS BUTTON_BACK #define IMGVIEW_PREVIOUS BUTTON_BOTTOMLEFT
#define IMGVIEW_MENU BUTTON_SELECT #define IMGVIEW_MENU BUTTON_SELECT
#define IMGVIEW_QUIT BUTTON_POWER #define IMGVIEW_QUIT BUTTON_BACK
#define IMGVIEW_SLIDE_SHOW BUTTON_PLAYPAUSE
#elif CONFIG_KEYPAD == SANSA_CONNECT_PAD #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD
#define IMGVIEW_ZOOM_PRE BUTTON_SELECT #define IMGVIEW_ZOOM_PRE BUTTON_SELECT

View file

@ -30,13 +30,14 @@ view a bigger file you may need to stop playback.}
\begin{btnmap} \begin{btnmap}
\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD% \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD% ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
,MROBE100_PAD,PBELL_VIBE500_PAD} ,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD}
{\ButtonUp\ / \ButtonDown}% {\ButtonUp\ / \ButtonDown}%
\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu\ / \ButtonPlay}% \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu\ / \ButtonPlay}%
\opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown} % \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown} %
\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD% \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD% ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
,MROBE100_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD} ,MROBE100_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD%
,SANSA_FUZEPLUS_PAD}
{/ \ButtonLeft\ / \ButtonRight} {/ \ButtonLeft\ / \ButtonRight}
\opt{MPIO_HD200_PAD}{\ButtonVolDown / \ButtonVolUp /% \opt{MPIO_HD200_PAD}{\ButtonVolDown / \ButtonVolUp /%
\ButtonRec + \ButtonRew / \ButtonRec + \ButtonFF} \ButtonRec + \ButtonRew / \ButtonRec + \ButtonFF}
@ -51,7 +52,7 @@ view a bigger file you may need to stop playback.}
,SANSA_FUZE_PAD,SANSA_C200_PAD,MROBE100_PAD}{\ButtonSelect} ,SANSA_FUZE_PAD,SANSA_C200_PAD,MROBE100_PAD}{\ButtonSelect}
\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd} \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
\opt{IRIVER_H10_PAD}{\ButtonPlay} \opt{IRIVER_H10_PAD}{\ButtonPlay}
\opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolUp} \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_FUZEPLUS_PAD}{\ButtonVolUp}
\opt{PBELL_VIBE500_PAD}{\ButtonRec+\ButtonUp} \opt{PBELL_VIBE500_PAD}{\ButtonRec+\ButtonUp}
\opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonPlay} \opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonPlay}
\opt{touchscreen}{\TouchTopRight} \opt{touchscreen}{\TouchTopRight}
@ -63,7 +64,7 @@ view a bigger file you may need to stop playback.}
\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack} \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack}
\opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD}{Long \ButtonSelect} \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD}{Long \ButtonSelect}
\opt{IRIVER_H10_PAD}{Long \ButtonPlay} \opt{IRIVER_H10_PAD}{Long \ButtonPlay}
\opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolDown} \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_FUZEPLUS_PAD}{\ButtonVolDown}
\opt{MROBE100_PAD}{\ButtonPlay} \opt{MROBE100_PAD}{\ButtonPlay}
\opt{PBELL_VIBE500_PAD}{\ButtonRec+\ButtonDown} \opt{PBELL_VIBE500_PAD}{\ButtonRec+\ButtonDown}
\opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonRec} \opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonRec}
@ -76,6 +77,7 @@ view a bigger file you may need to stop playback.}
\opt{IRIVER_H300_PAD}{\ButtonRec} \opt{IRIVER_H300_PAD}{\ButtonRec}
\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight} \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
\opt{IAUDIO_X5_PAD}{\ButtonPlay} \opt{IAUDIO_X5_PAD}{\ButtonPlay}
\opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomRight}
\opt{IRIVER_H10_PAD}{\ButtonFF} \opt{IRIVER_H10_PAD}{\ButtonFF}
\opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd} \opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd}
\opt{SANSA_C200_PAD}{\ButtonVolUp} \opt{SANSA_C200_PAD}{\ButtonVolUp}
@ -96,6 +98,7 @@ view a bigger file you may need to stop playback.}
\opt{IRIVER_H10_PAD}{\ButtonRew} \opt{IRIVER_H10_PAD}{\ButtonRew}
\opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollBack} \opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollBack}
\opt{SANSA_C200_PAD}{\ButtonVolDown} \opt{SANSA_C200_PAD}{\ButtonVolDown}
\opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomLeft}
\opt{GIGABEAT_PAD}{\ButtonA+\ButtonLeft} \opt{GIGABEAT_PAD}{\ButtonA+\ButtonLeft}
\opt{GIGABEAT_S_PAD}{\ButtonPrev} \opt{GIGABEAT_S_PAD}{\ButtonPrev}
\opt{MROBE100_PAD}{\ButtonDisplay+\ButtonLeft} \opt{MROBE100_PAD}{\ButtonDisplay+\ButtonLeft}
@ -105,8 +108,9 @@ view a bigger file you may need to stop playback.}
\opt{touchscreen}{\TouchBottomLeft} \opt{touchscreen}{\TouchBottomLeft}
\opt{HAVEREMOTEKEYMAP}{& } \opt{HAVEREMOTEKEYMAP}{& }
& Previous image in directory\\ & Previous image in directory\\
\opt{SANSA_E200_PAD,SANSA_C200_PAD}{%currently only defined for the sansa pads \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_FUZEPLUS_PAD}{%currently only defined for the sansa pads
\ButtonRec \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec}
\opt{SANSA_FUZEPLUS_PAD}{\ButtonPlay}
\opt{HAVEREMOTEKEYMAP}{& } \opt{HAVEREMOTEKEYMAP}{& }
& Toggle slide show mode\\ & Toggle slide show mode\\
} }
@ -118,6 +122,7 @@ view a bigger file you may need to stop playback.}
\opt{MPIO_HD200_PAD}{\ButtonFunc} \opt{MPIO_HD200_PAD}{\ButtonFunc}
\opt{MPIO_HD300_PAD}{\ButtonEnter} \opt{MPIO_HD300_PAD}{\ButtonEnter}
\opt{touchscreen}{\TouchCenter} \opt{touchscreen}{\TouchCenter}
\opt{SANSA_FUZEPLUS_PAD}{\ButtonSelect}
\opt{HAVEREMOTEKEYMAP}{& \opt{HAVEREMOTEKEYMAP}{&
\opt{IRIVER_RC_H100_PAD}{\ButtonRCStop} \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
} }
@ -129,6 +134,7 @@ view a bigger file you may need to stop playback.}
\opt{PBELL_VIBE500_PAD}{\ButtonCancel} \opt{PBELL_VIBE500_PAD}{\ButtonCancel}
\opt{MPIO_HD200_PAD}{\ButtonRec + \ButtonPlay} \opt{MPIO_HD200_PAD}{\ButtonRec + \ButtonPlay}
\opt{MPIO_HD300_PAD}{Long \ButtonMenu} \opt{MPIO_HD300_PAD}{Long \ButtonMenu}
\opt{SANSA_FUZEPLUS_PAD}{\ButtonBack}
\opt{HAVEREMOTEKEYMAP}{& } \opt{HAVEREMOTEKEYMAP}{& }
& Quit the viewer \\ & Quit the viewer \\
} }