Advertisement
Guest User

Untitled

a guest
Jun 14th, 2010
219
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 4.77 KB | None | 0 0
  1. diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
  2. index 65b024a..f98f24e 100644
  3. --- a/manual/appendix/config_file_options.tex
  4. +++ b/manual/appendix/config_file_options.tex
  5. @@ -126,8 +126,8 @@
  6. \opt{hotkey}{
  7. hotkey wps & off, view playlist, show track info,
  8. pitchscreen, open with, delete & N/A\\
  9. - hotkey tree & off, open with, delete, insert,
  10. - insert shuffled & N/A\\
  11. + \nopt{touchscreen}{hotkey tree & off, open with, delete, insert,
  12. + insert shuffled & N/A\\}
  13. }
  14. sort files & alpha, oldest, newest, type & N/A\\
  15. sort dirs & alpha, oldest, newest & N/A\\
  16. diff --git a/manual/configure_rockbox/hotkey_settings.tex b/manual/configure_rockbox/hotkey_settings.tex
  17. index b38d724..3443276 100755
  18. --- a/manual/configure_rockbox/hotkey_settings.tex
  19. +++ b/manual/configure_rockbox/hotkey_settings.tex
  20. @@ -3,12 +3,13 @@
  21. \section{\label{ref:HotkeySettings}Hotkey}
  22.  
  23. \begin{description}
  24. - \item[WPS Hotkey.]
  25. - \item[File Browser Hotkey.]
  26. - These options set the hotkey function for their respective screens
  27. - (see \reference{ref:Hotkeys}). The default for the WPS screen is
  28. - \setting{View Playlist}. The File Browser default is \setting{Off}.
  29. -
  30. - \end{description}
  31. + \item[WPS Hotkey.] \opt{touchscreen}{This options sets the hotkey function for
  32. + the WPS screen (see \reference{ref:Hotkeys}). The
  33. + default is \setting{View Playlist}.}
  34. + \nopt{touchscreen}{\item[File Browser Hotkey.]}
  35. + \end{description}
  36.  
  37. + \nopt{touchscreen}{These options set the hotkey function for their respective
  38. + screens (see \reference{ref:Hotkeys}). The default for the WPS screen is
  39. + \setting{View Playlist}. The File Browser default is \setting{Off}.}
  40. }
  41. diff --git a/manual/platform/keymap-cowond2.tex b/manual/platform/keymap-cowond2.tex
  42. index ebe3b8a..53140c8 100644
  43. --- a/manual/platform/keymap-cowond2.tex
  44. +++ b/manual/platform/keymap-cowond2.tex
  45. @@ -42,6 +42,8 @@
  46. \newcommand{\ActionWpsAbSetAPrevDir}{\TouchActionWpsAbSetAPrevDir}
  47. \newcommand{\ActionWpsAbReset}{\TouchActionWpsAbReset}
  48.  
  49. +\newcommand{\ActionWpsHotkey}{\TouchBottomRight}
  50. +
  51. %Button actions, tree context
  52. \newcommand{\ActionTreeWps}{\ButtonPlus{}+\ButtonMenu{} or \TouchActionTreeWps}
  53. \newcommand{\ActionTreeStop}{\ButtonMinus{}+\ButtonPower{} or \TouchActionTreeStop}
  54. diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex
  55. index b5d19cb..286fc7a 100644
  56. --- a/manual/rockbox_interface/browsing_and_playing.tex
  57. +++ b/manual/rockbox_interface/browsing_and_playing.tex
  58. @@ -107,7 +107,7 @@ the \setting{Show Files} setting to all.
  59. \ActionStdRec & Switch to the \setting{Recording Screen}.\\
  60. %
  61. }
  62. - \opt{hotkey}{
  63. + \nopt{cowond2}{\opt{hotkey}{
  64. \ActionTreeHotkey
  65. &
  66. \opt{HAVEREMOTEKEYMAP}{
  67. @@ -115,7 +115,7 @@ the \setting{Show Files} setting to all.
  68. Activate the \setting{Hotkey} function
  69. (see \reference{ref:Hotkeys}).
  70. \\
  71. - }
  72. + }}
  73. \end{btnmap}
  74.  
  75. \opt{RECORDER_PAD}{
  76. diff --git a/manual/rockbox_interface/hotkeys.tex b/manual/rockbox_interface/hotkeys.tex
  77. index 56dafa9..ec12bd0 100644
  78. --- a/manual/rockbox_interface/hotkeys.tex
  79. +++ b/manual/rockbox_interface/hotkeys.tex
  80. @@ -1,16 +1,17 @@
  81. % $Id$ %
  82. \opt{hotkey}{
  83. \section{\label{ref:Hotkeys}Hotkeys}
  84. - Hotkeys are shortcut keys for use in the \setting{File Browser}
  85. - and \setting{WPS} screens. To use one, press \ActionWpsHotkey{}
  86. - within the \setting{File Browser} or \setting{WPS} screens.
  87. - The assigned function will launch with reference to the current
  88. - file or directory, if applicable. Each screen has its own
  89. - assignment. If there is no assignment for a given screen,
  90. + Hotkeys are shortcut keys for use in the \nopt{touchscreen}{\setting{File Browser}
  91. + and }\setting{WPS} screen. To use one, press
  92. + \nopt{touchscreen}{\ActionTreeHotkey{} within the \setting{File Browser} or}
  93. + \ActionWpsHotkey{} within the \setting{WPS}
  94. + screen.\nopt{touchscreen}{ The assigned function will launch with reference
  95. + to the current file or directory, if applicable. Each screen has its own
  96. + assignment.} If there is no assignment for a given screen,
  97. the hotkey is ignored.
  98.  
  99. - The default assignment for the File Browser hotkey is
  100. - \setting{Off}, but the WPS hotkey defaults to
  101. + The default assignment for the \nopt{touchscreen}{File Browser hotkey is
  102. + \setting{Off}, while the default for the }WPS hotkey is
  103. \setting{View Playlist}.
  104.  
  105. The hotkey assignments are changed in the Hotkey menu (see
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement