summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Louis Biasini <jlbiasini@gmail.com>2012-11-21 20:41:33 +0200
committerAmaury Pouly <amaury.pouly@gmail.com>2012-12-26 17:30:31 +0100
commit0f0adfac71e1f7c3a5ea7474211bcc066fa1a311 (patch)
treec05c588725ea2d0fd204604f2246a619dcea6cad
parent7c488f50530ddf477d4334a40a6eb286cf5c64ab (diff)
downloadrockbox-0f0adfac71e1f7c3a5ea7474211bcc066fa1a311.tar.gz
rockbox-0f0adfac71e1f7c3a5ea7474211bcc066fa1a311.zip
[Fuze+] PictureFlow: complete keys mapping
1) add quit and menu binding 2) complete manual Change-Id: Iceee6354c788b8baeefeea2d2d8914e1df83d4a7 Reviewed-on: http://gerrit.rockbox.org/353 Reviewed-by: Amaury Pouly <amaury.pouly@gmail.com>
-rw-r--r--apps/plugins/pictureflow/pictureflow.c6
-rw-r--r--manual/plugins/pictureflow.tex8
2 files changed, 10 insertions, 4 deletions
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c
index ef18f53ffe..51fe5ebfc5 100644
--- a/apps/plugins/pictureflow/pictureflow.c
+++ b/apps/plugins/pictureflow/pictureflow.c
@@ -117,8 +117,12 @@ const struct button_mapping pf_context_buttons[] =
117 CONFIG_KEYPAD == PHILIPS_HDD1630_PAD || CONFIG_KEYPAD == IAUDIO67_PAD || \ 117 CONFIG_KEYPAD == PHILIPS_HDD1630_PAD || CONFIG_KEYPAD == IAUDIO67_PAD || \
118 CONFIG_KEYPAD == GIGABEAT_PAD || CONFIG_KEYPAD == GIGABEAT_S_PAD || \ 118 CONFIG_KEYPAD == GIGABEAT_PAD || CONFIG_KEYPAD == GIGABEAT_S_PAD || \
119 CONFIG_KEYPAD == MROBE100_PAD || CONFIG_KEYPAD == MROBE500_PAD || \ 119 CONFIG_KEYPAD == MROBE100_PAD || CONFIG_KEYPAD == MROBE500_PAD || \
120 CONFIG_KEYPAD == PHILIPS_SA9200_PAD || CONFIG_KEYPAD == SANSA_CLIP_PAD 120 CONFIG_KEYPAD == PHILIPS_SA9200_PAD || CONFIG_KEYPAD == SANSA_CLIP_PAD || \
121 CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD
121 {PF_QUIT, BUTTON_POWER, BUTTON_NONE}, 122 {PF_QUIT, BUTTON_POWER, BUTTON_NONE},
123#if CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD
124 {PF_MENU, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT},
125#endif
122#elif CONFIG_KEYPAD == SANSA_FUZE_PAD 126#elif CONFIG_KEYPAD == SANSA_FUZE_PAD
123 {PF_QUIT, BUTTON_HOME|BUTTON_REPEAT, BUTTON_NONE}, 127 {PF_QUIT, BUTTON_HOME|BUTTON_REPEAT, BUTTON_NONE},
124 {PF_TRACKLIST, BUTTON_RIGHT, BUTTON_NONE}, 128 {PF_TRACKLIST, BUTTON_RIGHT, BUTTON_NONE},
diff --git a/manual/plugins/pictureflow.tex b/manual/plugins/pictureflow.tex
index aff86bea38..270913f730 100644
--- a/manual/plugins/pictureflow.tex
+++ b/manual/plugins/pictureflow.tex
@@ -86,9 +86,10 @@ aware:
86 \\ 86 \\
87 } 87 }
88 88
89 \nopt{IAUDIO_M3_PAD,MPIO_HD200_PAD,MPIO_HD300_PAD,touchscreen}{\ButtonLeft} 89 \nopt{IAUDIO_M3_PAD,MPIO_HD200_PAD,MPIO_HD300_PAD,touchscreen,SANSA_FUZEPLUS_PAD}{\ButtonLeft}
90 \opt{MPIO_HD200_PAD}{\ButtonRec} 90 \opt{MPIO_HD200_PAD}{\ButtonRec}
91 \opt{MPIO_HD300_PAD}{\ButtonMenu} 91 \opt{MPIO_HD300_PAD}{\ButtonMenu}
92 \opt{SANSA_FUZEPLUS_PAD}{\ButtonLeft{} or \ButtonBack}
92 \opt{touchscreen}{ 93 \opt{touchscreen}{
93 \opt{COWON_D2_PAD}{\ButtonPower{} or} 94 \opt{COWON_D2_PAD}{\ButtonPower{} or}
94 \TouchBottomRight} 95 \TouchBottomRight}
@@ -99,7 +100,8 @@ aware:
99 Exit track list 100 Exit track list
100 \\ 101 \\
101 102
102 \nopt{IAUDIO_M3_PAD}{\ActionStdMenu} 103 \nopt{IAUDIO_M3_PAD,SANSA_FUZEPLUS_PAD}{\ActionStdMenu}
104 \opt{SANSA_FUZEPLUS_PAD}{long \ButtonSelect}
103 & 105 &
104 \opt{HAVEREMOTEKEYMAP}{ 106 \opt{HAVEREMOTEKEYMAP}{
105 \opt{IAUDIO_M3_PAD,GIGABEAT_RC_PAD}{\ActionRCStdMenu} 107 \opt{IAUDIO_M3_PAD,GIGABEAT_RC_PAD}{\ActionRCStdMenu}
@@ -110,7 +112,7 @@ aware:
110 \nopt{IAUDIO_M3_PAD}{% 112 \nopt{IAUDIO_M3_PAD}{%
111 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,ONDIO_PAD}{\ButtonOff} 113 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,ONDIO_PAD}{\ButtonOff}
112 \opt{IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD% 114 \opt{IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD%
113 ,MROBE100_PAD}{\ButtonPower} 115 ,MROBE100_PAD,SANSA_FUZEPLUS_PAD}{\ButtonPower}
114 \opt{SANSA_C200_PAD,IRIVER_H10_PAD}{Long \ButtonPower} 116 \opt{SANSA_C200_PAD,IRIVER_H10_PAD}{Long \ButtonPower}
115 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonMenu} 117 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonMenu}
116 \opt{SANSA_FUZE_PAD}{Long \ButtonHome} 118 \opt{SANSA_FUZE_PAD}{Long \ButtonHome}