diff options
author | Jean-Louis Biasini <jlbiasini@gmail.com> | 2012-11-21 22:40:22 +0200 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2012-12-26 17:30:54 +0100 |
commit | 5caaf70f345ee1b2a49cffe4dc779e1d810ba2cc (patch) | |
tree | af9abef8b7ed24d264f2c44907b2b12adb7d029c | |
parent | 0f0adfac71e1f7c3a5ea7474211bcc066fa1a311 (diff) | |
download | rockbox-5caaf70f345ee1b2a49cffe4dc779e1d810ba2cc.tar.gz rockbox-5caaf70f345ee1b2a49cffe4dc779e1d810ba2cc.zip |
[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>
-rw-r--r-- | apps/plugins/imageviewer/imageviewer_button.h | 7 | ||||
-rw-r--r-- | manual/plugins/imageviewer.tex | 20 |
2 files changed, 17 insertions, 10 deletions
diff --git a/apps/plugins/imageviewer/imageviewer_button.h b/apps/plugins/imageviewer/imageviewer_button.h index 94d481c6c3..51cdad329e 100644 --- a/apps/plugins/imageviewer/imageviewer_button.h +++ b/apps/plugins/imageviewer/imageviewer_button.h | |||
@@ -359,10 +359,11 @@ | |||
359 | #define IMGVIEW_DOWN BUTTON_DOWN | 359 | #define IMGVIEW_DOWN BUTTON_DOWN |
360 | #define IMGVIEW_LEFT BUTTON_LEFT | 360 | #define IMGVIEW_LEFT BUTTON_LEFT |
361 | #define IMGVIEW_RIGHT BUTTON_RIGHT | 361 | #define IMGVIEW_RIGHT BUTTON_RIGHT |
362 | #define IMGVIEW_NEXT BUTTON_PLAYPAUSE | 362 | #define IMGVIEW_NEXT BUTTON_BOTTOMRIGHT |
363 | #define IMGVIEW_PREVIOUS BUTTON_BACK | 363 | #define IMGVIEW_PREVIOUS BUTTON_BOTTOMLEFT |
364 | #define IMGVIEW_MENU BUTTON_SELECT | 364 | #define IMGVIEW_MENU BUTTON_SELECT |
365 | #define IMGVIEW_QUIT BUTTON_POWER | 365 | #define IMGVIEW_QUIT BUTTON_BACK |
366 | #define IMGVIEW_SLIDE_SHOW BUTTON_PLAYPAUSE | ||
366 | 367 | ||
367 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD | 368 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD |
368 | #define IMGVIEW_ZOOM_PRE BUTTON_SELECT | 369 | #define IMGVIEW_ZOOM_PRE BUTTON_SELECT |
diff --git a/manual/plugins/imageviewer.tex b/manual/plugins/imageviewer.tex index 3bf07cccee..8853ed15dd 100644 --- a/manual/plugins/imageviewer.tex +++ b/manual/plugins/imageviewer.tex | |||
@@ -30,13 +30,14 @@ view a bigger file you may need to stop playback.} | |||
30 | \begin{btnmap} | 30 | \begin{btnmap} |
31 | \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD% | 31 | \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD% |
32 | ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD% | 32 | ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD% |
33 | ,MROBE100_PAD,PBELL_VIBE500_PAD} | 33 | ,MROBE100_PAD,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD} |
34 | {\ButtonUp\ / \ButtonDown}% | 34 | {\ButtonUp\ / \ButtonDown}% |
35 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu\ / \ButtonPlay}% | 35 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu\ / \ButtonPlay}% |
36 | \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown} % | 36 | \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown} % |
37 | \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD% | 37 | \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD% |
38 | ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD% | 38 | ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD% |
39 | ,MROBE100_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD} | 39 | ,MROBE100_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD% |
40 | ,SANSA_FUZEPLUS_PAD} | ||
40 | {/ \ButtonLeft\ / \ButtonRight} | 41 | {/ \ButtonLeft\ / \ButtonRight} |
41 | \opt{MPIO_HD200_PAD}{\ButtonVolDown / \ButtonVolUp /% | 42 | \opt{MPIO_HD200_PAD}{\ButtonVolDown / \ButtonVolUp /% |
42 | \ButtonRec + \ButtonRew / \ButtonRec + \ButtonFF} | 43 | \ButtonRec + \ButtonRew / \ButtonRec + \ButtonFF} |
@@ -51,7 +52,7 @@ view a bigger file you may need to stop playback.} | |||
51 | ,SANSA_FUZE_PAD,SANSA_C200_PAD,MROBE100_PAD}{\ButtonSelect} | 52 | ,SANSA_FUZE_PAD,SANSA_C200_PAD,MROBE100_PAD}{\ButtonSelect} |
52 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd} | 53 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd} |
53 | \opt{IRIVER_H10_PAD}{\ButtonPlay} | 54 | \opt{IRIVER_H10_PAD}{\ButtonPlay} |
54 | \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolUp} | 55 | \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_FUZEPLUS_PAD}{\ButtonVolUp} |
55 | \opt{PBELL_VIBE500_PAD}{\ButtonRec+\ButtonUp} | 56 | \opt{PBELL_VIBE500_PAD}{\ButtonRec+\ButtonUp} |
56 | \opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonPlay} | 57 | \opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonPlay} |
57 | \opt{touchscreen}{\TouchTopRight} | 58 | \opt{touchscreen}{\TouchTopRight} |
@@ -63,7 +64,7 @@ view a bigger file you may need to stop playback.} | |||
63 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack} | 64 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack} |
64 | \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD}{Long \ButtonSelect} | 65 | \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD}{Long \ButtonSelect} |
65 | \opt{IRIVER_H10_PAD}{Long \ButtonPlay} | 66 | \opt{IRIVER_H10_PAD}{Long \ButtonPlay} |
66 | \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolDown} | 67 | \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_FUZEPLUS_PAD}{\ButtonVolDown} |
67 | \opt{MROBE100_PAD}{\ButtonPlay} | 68 | \opt{MROBE100_PAD}{\ButtonPlay} |
68 | \opt{PBELL_VIBE500_PAD}{\ButtonRec+\ButtonDown} | 69 | \opt{PBELL_VIBE500_PAD}{\ButtonRec+\ButtonDown} |
69 | \opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonRec} | 70 | \opt{MPIO_HD200_PAD,MPIO_HD300_PAD}{\ButtonRec} |
@@ -76,6 +77,7 @@ view a bigger file you may need to stop playback.} | |||
76 | \opt{IRIVER_H300_PAD}{\ButtonRec} | 77 | \opt{IRIVER_H300_PAD}{\ButtonRec} |
77 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight} | 78 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight} |
78 | \opt{IAUDIO_X5_PAD}{\ButtonPlay} | 79 | \opt{IAUDIO_X5_PAD}{\ButtonPlay} |
80 | \opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomRight} | ||
79 | \opt{IRIVER_H10_PAD}{\ButtonFF} | 81 | \opt{IRIVER_H10_PAD}{\ButtonFF} |
80 | \opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd} | 82 | \opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd} |
81 | \opt{SANSA_C200_PAD}{\ButtonVolUp} | 83 | \opt{SANSA_C200_PAD}{\ButtonVolUp} |
@@ -96,6 +98,7 @@ view a bigger file you may need to stop playback.} | |||
96 | \opt{IRIVER_H10_PAD}{\ButtonRew} | 98 | \opt{IRIVER_H10_PAD}{\ButtonRew} |
97 | \opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollBack} | 99 | \opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollBack} |
98 | \opt{SANSA_C200_PAD}{\ButtonVolDown} | 100 | \opt{SANSA_C200_PAD}{\ButtonVolDown} |
101 | \opt{SANSA_FUZEPLUS_PAD}{\ButtonBottomLeft} | ||
99 | \opt{GIGABEAT_PAD}{\ButtonA+\ButtonLeft} | 102 | \opt{GIGABEAT_PAD}{\ButtonA+\ButtonLeft} |
100 | \opt{GIGABEAT_S_PAD}{\ButtonPrev} | 103 | \opt{GIGABEAT_S_PAD}{\ButtonPrev} |
101 | \opt{MROBE100_PAD}{\ButtonDisplay+\ButtonLeft} | 104 | \opt{MROBE100_PAD}{\ButtonDisplay+\ButtonLeft} |
@@ -105,9 +108,10 @@ view a bigger file you may need to stop playback.} | |||
105 | \opt{touchscreen}{\TouchBottomLeft} | 108 | \opt{touchscreen}{\TouchBottomLeft} |
106 | \opt{HAVEREMOTEKEYMAP}{& } | 109 | \opt{HAVEREMOTEKEYMAP}{& } |
107 | & Previous image in directory\\ | 110 | & Previous image in directory\\ |
108 | \opt{SANSA_E200_PAD,SANSA_C200_PAD}{%currently only defined for the sansa pads | 111 | \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_FUZEPLUS_PAD}{%currently only defined for the sansa pads |
109 | \ButtonRec | 112 | \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec} |
110 | \opt{HAVEREMOTEKEYMAP}{& } | 113 | \opt{SANSA_FUZEPLUS_PAD}{\ButtonPlay} |
114 | \opt{HAVEREMOTEKEYMAP}{& } | ||
111 | & Toggle slide show mode\\ | 115 | & Toggle slide show mode\\ |
112 | } | 116 | } |
113 | \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff} | 117 | \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff} |
@@ -118,6 +122,7 @@ view a bigger file you may need to stop playback.} | |||
118 | \opt{MPIO_HD200_PAD}{\ButtonFunc} | 122 | \opt{MPIO_HD200_PAD}{\ButtonFunc} |
119 | \opt{MPIO_HD300_PAD}{\ButtonEnter} | 123 | \opt{MPIO_HD300_PAD}{\ButtonEnter} |
120 | \opt{touchscreen}{\TouchCenter} | 124 | \opt{touchscreen}{\TouchCenter} |
125 | \opt{SANSA_FUZEPLUS_PAD}{\ButtonSelect} | ||
121 | \opt{HAVEREMOTEKEYMAP}{& | 126 | \opt{HAVEREMOTEKEYMAP}{& |
122 | \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop} | 127 | \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop} |
123 | } | 128 | } |
@@ -129,6 +134,7 @@ view a bigger file you may need to stop playback.} | |||
129 | \opt{PBELL_VIBE500_PAD}{\ButtonCancel} | 134 | \opt{PBELL_VIBE500_PAD}{\ButtonCancel} |
130 | \opt{MPIO_HD200_PAD}{\ButtonRec + \ButtonPlay} | 135 | \opt{MPIO_HD200_PAD}{\ButtonRec + \ButtonPlay} |
131 | \opt{MPIO_HD300_PAD}{Long \ButtonMenu} | 136 | \opt{MPIO_HD300_PAD}{Long \ButtonMenu} |
137 | \opt{SANSA_FUZEPLUS_PAD}{\ButtonBack} | ||
132 | \opt{HAVEREMOTEKEYMAP}{& } | 138 | \opt{HAVEREMOTEKEYMAP}{& } |
133 | & Quit the viewer \\ | 139 | & Quit the viewer \\ |
134 | } | 140 | } |