diff options
author | Marianne Arnold <pixelma@rockbox.org> | 2009-07-05 18:21:19 +0000 |
---|---|---|
committer | Marianne Arnold <pixelma@rockbox.org> | 2009-07-05 18:21:19 +0000 |
commit | 6f169b4373d4d59b657928cbf61eaead8fe9e58c (patch) | |
tree | d7bb9ffd5ee73402cd49aef3313690ad9b9a0c85 /manual/main_menu | |
parent | f1034e00f6196c810466da66a9a24bf2e5f61272 (diff) | |
download | rockbox-6f169b4373d4d59b657928cbf61eaead8fe9e58c.tar.gz rockbox-6f169b4373d4d59b657928cbf61eaead8fe9e58c.zip |
Manual: clean up some things related to the inclusion of the remotes. For button tables that use the 'Action' defines use HAVEREMOTEKEYMAP instead of the IRIVER_RC_H100_PAD so that the commands defined in the remote-keymap platform files will automatically be used. If a remote does not have all actions assigned, we can still define these commands but leave them empty. There will be some exceptions but this is still better than long opt lists. - Revert the changes to nim.tex (a Player only plugin) and splitedit.tex (bitmap Archos only) in the plugins section.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21666 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'manual/main_menu')
-rw-r--r-- | manual/main_menu/fmradio.tex | 22 | ||||
-rw-r--r-- | manual/main_menu/main.tex | 24 | ||||
-rw-r--r-- | manual/main_menu/recording_screen.tex | 16 |
3 files changed, 33 insertions, 29 deletions
diff --git a/manual/main_menu/fmradio.tex b/manual/main_menu/fmradio.tex index 1763e074c2..f2bdfbf10d 100644 --- a/manual/main_menu/fmradio.tex +++ b/manual/main_menu/fmradio.tex | |||
@@ -22,16 +22,20 @@ | |||
22 | \begin{table} | 22 | \begin{table} |
23 | \begin{btnmap}{}{} | 23 | \begin{btnmap}{}{} |
24 | \ActionFMPrev, \ActionFMNext | 24 | \ActionFMPrev, \ActionFMNext |
25 | \opt{IRIVER_RC_H100_PAD}{& \ActionRCFMPrev, \ActionRCFMNext} | 25 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCFMPrev, \ActionRCFMNext} |
26 | & Change frequency in \setting{SCAN} mode or jump to next/previous | 26 | & Change frequency in \setting{SCAN} mode or jump to next/previous |
27 | station in \setting{PRESET} mode\\ | 27 | station in \setting{PRESET} mode\\ |
28 | % | 28 | % |
29 | Long \ActionFMPrev, \ActionFMNext | 29 | Long \ActionFMPrev, \ActionFMNext |
30 | \opt{IRIVER_RC_H100_PAD}{& Long \ActionRCFMPrev, Long \ActionRCFMNext} | 30 | \opt{HAVEREMOTEKEYMAP}{& Long \ActionRCFMPrev, Long \ActionRCFMNext} |
31 | & Seek to next station or preset in \setting{SCAN} mode.\\ | 31 | & Seek to next station or preset in \setting{SCAN} mode.\\ |
32 | % | 32 | % |
33 | \ActionFMSettingsInc, \ActionFMSettingsDec | 33 | \ActionFMSettingsInc, \ActionFMSettingsDec |
34 | \opt{IRIVER_RC_H100_PAD}{& \ActionRCFMVolUp, \ActionRCFMVolDown} | 34 | \opt{HAVEREMOTEKEYMAP}{ |
35 | & | ||
36 | \opt{IRIVER_RC_H100_PAD}{\ActionRCFMVolUp, \ActionRCFMVolDown}% | ||
37 | \nopt{IRIVER_RC_H100_PAD}{\ActionRCFMSettingsInc, \ActionRCFMSettingsDec}% | ||
38 | } | ||
35 | & Change volume.\\ | 39 | & Change volume.\\ |
36 | \opt{RECORDER_PAD}{ | 40 | \opt{RECORDER_PAD}{ |
37 | \ButtonPlay | 41 | \ButtonPlay |
@@ -41,30 +45,30 @@ | |||
41 | 45 | ||
42 | % | 46 | % |
43 | \ActionFMExit | 47 | \ActionFMExit |
44 | \opt{IRIVER_RC_H100_PAD}{& \ActionRCFMExit} | 48 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCFMExit} |
45 | & Leave the radio screen with the radio playing.\\ | 49 | & Leave the radio screen with the radio playing.\\ |
46 | % | 50 | % |
47 | \ActionFMStop | 51 | \ActionFMStop |
48 | \opt{IRIVER_RC_H100_PAD}{& \ActionRCFMStop} | 52 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCFMStop} |
49 | & Stops the radio and returns to \setting{Main Menu}.\\% | 53 | & Stops the radio and returns to \setting{Main Menu}.\\% |
50 | % | 54 | % |
51 | \nopt{ONDIO_PAD}{% | 55 | \nopt{ONDIO_PAD}{% |
52 | \nopt{RECORDER_PAD}{\ActionFMPlay | 56 | \nopt{RECORDER_PAD}{\ActionFMPlay |
53 | \opt{IRIVER_RC_H100_PAD}{& \ActionRCFMPlay} | 57 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCFMPlay} |
54 | & Mutes radio playback.\\}% | 58 | & Mutes radio playback.\\}% |
55 | % | 59 | % |
56 | \ActionFMMode | 60 | \ActionFMMode |
57 | \opt{IRIVER_RC_H100_PAD}{& \ActionRCFMMode} | 61 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCFMMode} |
58 | & Switches between \setting{SCAN} and \setting{PRESET} mode.\\ | 62 | & Switches between \setting{SCAN} and \setting{PRESET} mode.\\ |
59 | % | 63 | % |
60 | \ActionFMPreset | 64 | \ActionFMPreset |
61 | \opt{IRIVER_RC_H100_PAD}{& \ActionRCFMPreset} | 65 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCFMPreset} |
62 | & Opens a list of radio presets. You can view all the presets that | 66 | & Opens a list of radio presets. You can view all the presets that |
63 | you have, and switch to the station.\\ | 67 | you have, and switch to the station.\\ |
64 | }% | 68 | }% |
65 | % | 69 | % |
66 | \ActionFMMenu | 70 | \ActionFMMenu |
67 | \opt{IRIVER_RC_H100_PAD}{& \ActionRCFMMenu} | 71 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCFMMenu} |
68 | & Displays the FM radio settings menu.\\ | 72 | & Displays the FM radio settings menu.\\ |
69 | \end{btnmap} | 73 | \end{btnmap} |
70 | \end{table} | 74 | \end{table} |
diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex index d199ebe928..cbdff0833e 100644 --- a/manual/main_menu/main.tex +++ b/manual/main_menu/main.tex | |||
@@ -19,24 +19,24 @@ safely (see \reference{ref:Safeshutdown}). | |||
19 | \begin{table} | 19 | \begin{table} |
20 | \begin{btnmap}{}{} | 20 | \begin{btnmap}{}{} |
21 | \ActionStdNext | 21 | \ActionStdNext |
22 | \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdNext} | 22 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdNext} |
23 | & Selects the next option in the menu.\\ | 23 | & Selects the next option in the menu.\\ |
24 | 24 | ||
25 | & \opt{IRIVER_RC_H100_PAD}{&} Inside a setting, | 25 | & \opt{HAVEREMOTEKEYMAP}{&} Inside a setting, |
26 | increases the value or chooses next option \\ | 26 | increases the value or chooses next option \\ |
27 | % | 27 | % |
28 | \ActionStdPrev | 28 | \ActionStdPrev |
29 | \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdPrev} | 29 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdPrev} |
30 | & Selects the previous option in the menu.\\ | 30 | & Selects the previous option in the menu.\\ |
31 | & \opt{IRIVER_RC_H100_PAD}{&} Inside a setting, | 31 | & \opt{HAVEREMOTEKEYMAP}{&} Inside a setting, |
32 | decreases the value or chooses previous option \\ | 32 | decreases the value or chooses previous option \\ |
33 | % | 33 | % |
34 | \ActionStdOk | 34 | \ActionStdOk |
35 | \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdOk} | 35 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdOk} |
36 | & Selects option \\ | 36 | & Selects option \\ |
37 | % | 37 | % |
38 | \ActionStdCancel | 38 | \ActionStdCancel |
39 | \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdCancel} | 39 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdCancel} |
40 | & Exits menu, setting or moves to parent menu\\ | 40 | & Exits menu, setting or moves to parent menu\\ |
41 | \end{btnmap} | 41 | \end{btnmap} |
42 | \end{table} | 42 | \end{table} |
@@ -51,27 +51,27 @@ jump straight to that track. | |||
51 | \begin{table} | 51 | \begin{table} |
52 | \begin{btnmap}{}{} | 52 | \begin{btnmap}{}{} |
53 | \ActionStdNext | 53 | \ActionStdNext |
54 | \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdNext} | 54 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdNext} |
55 | & Selects the next bookmark.\\ | 55 | & Selects the next bookmark.\\ |
56 | % | 56 | % |
57 | \ActionStdPrev | 57 | \ActionStdPrev |
58 | \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdPrev} | 58 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdPrev} |
59 | & Selects the previous bookmark.\\ | 59 | & Selects the previous bookmark.\\ |
60 | % | 60 | % |
61 | \ActionStdOk | 61 | \ActionStdOk |
62 | \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdOk} | 62 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdOk} |
63 | & Resumes from the selected bookmark.\\ | 63 | & Resumes from the selected bookmark.\\ |
64 | % | 64 | % |
65 | \ActionStdCancel | 65 | \ActionStdCancel |
66 | \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdCancel} | 66 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdCancel} |
67 | & Exits Recent Bookmark menu\\ | 67 | & Exits Recent Bookmark menu\\ |
68 | % | 68 | % |
69 | \nopt{GIGABEAT_S_PAD}{\ActionBmDelete | 69 | \nopt{GIGABEAT_S_PAD}{\ActionBmDelete |
70 | \opt{IRIVER_RC_H100_PAD}{& \ActionRCBmDelete} | 70 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCBmDelete} |
71 | & Deletes the currently selected bookmark\\} | 71 | & Deletes the currently selected bookmark\\} |
72 | % | 72 | % |
73 | \ActionStdContext | 73 | \ActionStdContext |
74 | \opt{IRIVER_RC_H100_PAD}{& \ActionRCStdContext} | 74 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdContext} |
75 | & Enters the context menu for the selected bookmark.\\ | 75 | & Enters the context menu for the selected bookmark.\\ |
76 | \end{btnmap} | 76 | \end{btnmap} |
77 | \end{table} | 77 | \end{table} |
diff --git a/manual/main_menu/recording_screen.tex b/manual/main_menu/recording_screen.tex index 7102d596ae..30f86afd39 100644 --- a/manual/main_menu/recording_screen.tex +++ b/manual/main_menu/recording_screen.tex | |||
@@ -31,36 +31,36 @@ The controls for this screen are: | |||
31 | \begin{btnmap}{}{} | 31 | \begin{btnmap}{}{} |
32 | 32 | ||
33 | \ActionRecPrev{} / \ActionRecNext | 33 | \ActionRecPrev{} / \ActionRecNext |
34 | \opt{IRIVER_RC_H100_PAD}{& \ActionRCRecPrev{} / \ActionRCRecNext} | 34 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCRecPrev{} / \ActionRCRecNext} |
35 | & Select setting.\\ | 35 | & Select setting.\\ |
36 | % | 36 | % |
37 | \ActionRecSettingsDec{} / \ActionRecSettingsInc | 37 | \ActionRecSettingsDec{} / \ActionRecSettingsInc |
38 | \opt{IRIVER_RC_H100_PAD}{& \ActionRCRecSettingsDec{} / \ActionRecSettingsInc} | 38 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCRecSettingsDec{} / \ActionRecSettingsInc} |
39 | & Adjust selected setting.\\ | 39 | & Adjust selected setting.\\ |
40 | % | 40 | % |
41 | \ActionRecPause | 41 | \ActionRecPause |
42 | \opt{IRIVER_RC_H100_PAD}{& \ActionRCRecPause} | 42 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCRecPause} |
43 | & Start recording.\\ | 43 | & Start recording.\\ |
44 | & \opt{IRIVER_RC_H100_PAD}{&} | 44 | & \opt{HAVEREMOTEKEYMAP}{&} |
45 | While recording: pause recording (press again to | 45 | While recording: pause recording (press again to |
46 | continue).\\ | 46 | continue).\\ |
47 | % | 47 | % |
48 | \ActionRecExit | 48 | \ActionRecExit |
49 | \opt{IRIVER_RC_H100_PAD}{& \ActionRCRecExit} | 49 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCRecExit} |
50 | & Exit \setting{Recording Screen}.\\ | 50 | & Exit \setting{Recording Screen}.\\ |
51 | & \opt{IRIVER_RC_H100_PAD}{&} | 51 | & \opt{HAVEREMOTEKEYMAP}{&} |
52 | While recording: Stop recording.\\ | 52 | While recording: Stop recording.\\ |
53 | % | 53 | % |
54 | \opt{IRIVER_H10_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,% | 54 | \opt{IRIVER_H10_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,% |
55 | SANSA_E200_PAD,IPOD_4G_PAD,SANSA_C200_PAD}{ | 55 | SANSA_E200_PAD,IPOD_4G_PAD,SANSA_C200_PAD}{ |
56 | \ActionRecNewfile | 56 | \ActionRecNewfile |
57 | \opt{IRIVER_RC_H100_PAD}{& \ActionRCRecNewfile} | 57 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCRecNewfile} |
58 | & While recording: close the current file and open | 58 | & While recording: close the current file and open |
59 | a new one.\\ | 59 | a new one.\\ |
60 | } | 60 | } |
61 | % | 61 | % |
62 | \ActionRecMenu | 62 | \ActionRecMenu |
63 | \opt{IRIVER_RC_H100_PAD}{& \ActionRCRecMenu} | 63 | \opt{HAVEREMOTEKEYMAP}{& \ActionRCRecMenu} |
64 | & Open \setting{Recording Settings} (see | 64 | & Open \setting{Recording Settings} (see |
65 | \reference{ref:Recordingsettings}).\\ | 65 | \reference{ref:Recordingsettings}).\\ |
66 | % | 66 | % |