From b1d1749790fe65b90d43117c6f248b844d4825bc Mon Sep 17 00:00:00 2001 From: pixelma Date: Sun, 7 Oct 2007 17:54:12 +0000 Subject: [PATCH] Replace all occurances of 'Hold ButtonX' with 'Long ButtonX' in the button tables like it was agreed on. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15019 a1c6a512-1295-4272-9138-f99709370657 --- manual/main_menu/fmradio.tex | 14 +++++++------- manual/plugins/calculator.tex | 4 ++-- manual/plugins/chessbox.tex | 2 +- manual/plugins/cube.tex | 2 +- manual/plugins/jewels.tex | 10 +++++----- manual/plugins/mandelbrot.tex | 4 ++-- manual/plugins/minesweeper.tex | 10 +++++----- manual/plugins/oscilloscope.tex | 4 ++-- manual/plugins/rockboy.tex | 2 +- manual/plugins/sliding.tex | 2 +- manual/plugins/solitaire.tex | 18 +++++++++--------- manual/plugins/vumeter.tex | 2 +- manual/rockbox_interface/browsing_and_playing.tex | 6 +++--- manual/rockbox_interface/main.tex | 10 +++++----- manual/rockbox_interface/wps.tex | 2 +- 15 files changed, 46 insertions(+), 46 deletions(-) diff --git a/manual/main_menu/fmradio.tex b/manual/main_menu/fmradio.tex index b030bb689..f031a4fbb 100644 --- a/manual/main_menu/fmradio.tex +++ b/manual/main_menu/fmradio.tex @@ -78,13 +78,13 @@ \opt{RECORDER_PAD}{Press \ButtonFTwo\ to go to the presets list, press \ButtonFOne\ to add a preset.}% \opt{ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{% - \opt{ONDIO_PAD}{Hold \ButtonMenu}% - \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{Hold \ButtonSelect} + \opt{ONDIO_PAD}{Long \ButtonMenu}% + \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{Long \ButtonSelect} to go to the menu, then select \setting{Add preset}.% } Enter the name (maximum number of characters is 32). \opt{RECORDER_PAD}{Press \ButtonFTwo}% - \opt{ONDIO_PAD}{Hold \ButtonMenu}% + \opt{ONDIO_PAD}{Long \ButtonMenu}% \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{Press \ButtonOn}% \opt{IAUDIO_X5_PAD}{Press \ButtonPlay} to save. @@ -93,7 +93,7 @@ \wikilink{FmPresets} \item[Selecting a preset:] - \opt{ONDIO_PAD}{Hold \ButtonMenu\ to open the menu, select + \opt{ONDIO_PAD}{Long \ButtonMenu\ to open the menu, select \setting{Preset}}% \opt{RECORDER_PAD}{Press \ButtonFTwo}% \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{Press \ButtonSelect} @@ -106,14 +106,14 @@ anything. \item[Removing a preset:] - \opt{ONDIO_PAD}{Hold \ButtonMenu\ to open the menu, select \setting{Preset}}% + \opt{ONDIO_PAD}{Long \ButtonMenu\ to open the menu, select \setting{Preset}}% \opt{RECORDER_PAD}{Press \ButtonFTwo}% \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{Press \ButtonSelect} to go to the presets list. Use \ButtonUp\ and \ButtonDown\ to move the cursor and then \opt{RECORDER_PAD}{press \ButtonFThree}% - \opt{ONDIO_PAD}{Hold \ButtonRight}% - \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{Hold \ButtonSelect} + \opt{ONDIO_PAD}{Long \ButtonRight}% + \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{Long \ButtonSelect} on the preset that you wish to remove, then select \setting{Remove Preset}. \opt{RECORDER_PAD,ONDIO_PAD}{ diff --git a/manual/plugins/calculator.tex b/manual/plugins/calculator.tex index 27bf6717f..ded7f7496 100644 --- a/manual/plugins/calculator.tex +++ b/manual/plugins/calculator.tex @@ -27,9 +27,9 @@ available maths functions on the right hand side. \opt{IRIVER_H10_PAD}{\ButtonRew & Delete last entered digit or clear after calculation\\} % \opt{RECORDER_PAD}{\ButtonFThree} - \opt{ONDIO_PAD}{Hold \ButtonMenu} + \opt{ONDIO_PAD}{Long \ButtonMenu} \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn} - \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Hold \ButtonPlay} + \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonPlay} \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay} \opt{SANSA_E200_PAD}{\ButtonSelect} & Calculate\\ diff --git a/manual/plugins/chessbox.tex b/manual/plugins/chessbox.tex index 903a7cbc6..57caad21d 100644 --- a/manual/plugins/chessbox.tex +++ b/manual/plugins/chessbox.tex @@ -42,7 +42,7 @@ the game. \opt{GIGABEAT_PAD}{\ButtonMenu} & Change level\\ \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn} - \opt{ONDIO_PAD}{Hold \ButtonMenu} + \opt{ONDIO_PAD}{Long \ButtonMenu} \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay} \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay} \opt{SANSA_E200_PAD}{\ButtonSelect+\ButtonRight} diff --git a/manual/plugins/cube.tex b/manual/plugins/cube.tex index 705fc8be7..d346381bc 100644 --- a/manual/plugins/cube.tex +++ b/manual/plugins/cube.tex @@ -21,7 +21,7 @@ This is a rotating cube screen saver in 3D. \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu} \opt{IAUDIO_X5_PAD}{\ButtonSelect} \opt{IRIVER_H10_PAD}{\ButtonRew} - \opt{SANSA_E200_PAD}{Hold \ButtonSelect} + \opt{SANSA_E200_PAD}{Long \ButtonSelect} & Cycle draw mode\\ \ButtonRight/\ButtonLeft & Increase / decrease x axis\\ diff --git a/manual/plugins/jewels.tex b/manual/plugins/jewels.tex index b224b4bc5..aa1219ccb 100644 --- a/manual/plugins/jewels.tex +++ b/manual/plugins/jewels.tex @@ -17,7 +17,7 @@ after every one hundred points and randomly clears several jewels. & Move the cursor around the jewels \\ \ButtonPlay & Select a jewel \\ - Hold \ButtonPlay + Long \ButtonPlay & Show the in-game menu\\ \ButtonOff & Exit\\ @@ -31,7 +31,7 @@ after every one hundred points and randomly clears several jewels. & Move the cursor around the jewels \\ \ButtonMenu & Select a jewel \\ - Hold \ButtonMenu + Long \ButtonMenu & Show the in-game menu\\ \ButtonOff & Exit\\ @@ -45,7 +45,7 @@ after every one hundred points and randomly clears several jewels. & Move the cursor around the jewels \\ \ButtonSelect & Select a jewel \\ - Hold \ButtonSelect + Long \ButtonSelect & Show the in-game menu\\ \ButtonOff & Exit\\ @@ -59,7 +59,7 @@ after every one hundred points and randomly clears several jewels. & Move the cursor around the jewels \\ \ButtonSelect & Select a jewel \\ - Hold \ButtonSelect + Long \ButtonSelect & Show the in-game menu\\ \end{btnmap} \end{table} @@ -72,7 +72,7 @@ after every one hundred points and randomly clears several jewels. & Move the cursor around the jewels \\ \ButtonSelect & Select a jewel \\ - Hold \ButtonSelect + Long \ButtonSelect & Show the in-game menu\\ \ButtonPower & Exit\\ diff --git a/manual/plugins/mandelbrot.tex b/manual/plugins/mandelbrot.tex index 1335ff6d6..7abe4f6c9 100644 --- a/manual/plugins/mandelbrot.tex +++ b/manual/plugins/mandelbrot.tex @@ -15,8 +15,8 @@ Direction keys & Move about the image\\ \opt{ONDIO_PAD}{\ButtonMenu+\ButtonDown} \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode} \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack} -\opt{IAUDIO_X5_PAD}{Hold \ButtonSelect} -\opt{IRIVER_H10_PAD}{Hold \ButtonPlay} +\opt{IAUDIO_X5_PAD}{Long \ButtonSelect} +\opt{IRIVER_H10_PAD}{Long \ButtonPlay} \opt{SANSA_E200_PAD}{\ButtonScrollUp} & Zoom out\\ \opt{RECORDER_PAD}{\ButtonFOne} diff --git a/manual/plugins/minesweeper.tex b/manual/plugins/minesweeper.tex index 02973a8f8..ae0c802ca 100644 --- a/manual/plugins/minesweeper.tex +++ b/manual/plugins/minesweeper.tex @@ -48,19 +48,19 @@ the location of a mine, it can be tagged to avoid accidentally & Toggle flag on / off \\ % \opt{RECORDER_PAD}{\ButtonFTwo/\ButtonPlay} - \opt{ONDIO_PAD}{Hold \ButtonMenu} + \opt{ONDIO_PAD}{Long \ButtonMenu} \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD}{\ButtonSelect} - \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Hold \ButtonSelect} + \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonSelect} \opt{IRIVER_H10_PAD}{\ButtonRew} - \opt{SANSA_C200_PAD}{Hold \ButtonSelect/\ButtonVolUp} + \opt{SANSA_C200_PAD}{Long \ButtonSelect/\ButtonVolUp} & Reveal the contents of the current square \\ % \opt{RECORDER_PAD}{\ButtonFThree} - \opt{ONDIO_PAD}{Hold \ButtonMenu+\ButtonOff} + \opt{ONDIO_PAD}{Long \ButtonMenu+\ButtonOff} \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode} \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay} \opt{IAUDIO_X5_PAD,SANSA_C200_PAD}{\ButtonRec} - \opt{SANSA_E200_PAD}{Hold \ButtonRec} + \opt{SANSA_E200_PAD}{Long \ButtonRec} \opt{IRIVER_H10_PAD}{\ButtonRew+\ButtonPlay} \opt{GIGABEAT_PAD}{\ButtonMenu} & Display the current game status \\ diff --git a/manual/plugins/oscilloscope.tex b/manual/plugins/oscilloscope.tex index bd903c0c1..f91ee3384 100644 --- a/manual/plugins/oscilloscope.tex +++ b/manual/plugins/oscilloscope.tex @@ -31,8 +31,8 @@ being played. \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft} \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec} \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft} - \opt{IAUDIO_X5_PAD}{Hold \ButtonSelect} - \opt{IRIVER_H10_PAD}{Hold \ButtonRew} + \opt{IAUDIO_X5_PAD}{Long \ButtonSelect} + \opt{IRIVER_H10_PAD}{Long \ButtonRew} \opt{SANSA_E200_PAD}{\ButtonUp} & Toggle drawing orientation \\ \opt{RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay} diff --git a/manual/plugins/rockboy.tex b/manual/plugins/rockboy.tex index 90e8d409b..c267e0b84 100644 --- a/manual/plugins/rockboy.tex +++ b/manual/plugins/rockboy.tex @@ -33,7 +33,7 @@ the gnuboy emulator. To start a game open a ROM file saved as \fname{.gb} or \opt{RECORDER_PAD}{\ButtonOn & Cycle display scaling modes\\} \opt{RECORDER_PAD,IRIVER_H300_PAD}{\ButtonOff} \opt{IRIVER_H100_PAD}{\ButtonMode} - \opt{IPOD_4G_PAD}{Hold \ButtonSelect} + \opt{IPOD_4G_PAD}{Long \ButtonSelect} \opt{SANSA_E200_PAD}{\ButtonPower} & Open Rockboy menu\\ \end{btnmap} diff --git a/manual/plugins/sliding.tex b/manual/plugins/sliding.tex index a9a85e1e6..f4da1ded0 100644 --- a/manual/plugins/sliding.tex +++ b/manual/plugins/sliding.tex @@ -15,7 +15,7 @@ Key controls: & Move Tile \\ % \opt{RECORDER_PAD}{\ButtonFOne} - \opt{ONDIO_PAD}{Hold \ButtonMenu} + \opt{ONDIO_PAD}{Long \ButtonMenu} \opt{h1xx,h300,GIGABEAT_PAD}{\ButtonSelect} \opt{x5,SANSA_E200_PAD}{\ButtonRec} \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft} diff --git a/manual/plugins/solitaire.tex b/manual/plugins/solitaire.tex index 80ca93d8d..072c93d8c 100644 --- a/manual/plugins/solitaire.tex +++ b/manual/plugins/solitaire.tex @@ -29,20 +29,20 @@ visit\\ & Select cards, move cards, reveal hidden cards...\\ % \opt{RECORDER_PAD}{\ButtonFOne} - \opt{ONDIO_PAD}{Hold \ButtonMenu} + \opt{ONDIO_PAD}{Long \ButtonMenu} \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode} \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD}{\ButtonMenu} \opt{IAUDIO_X5_PAD}{\ButtonPlay} - \opt{IRIVER_H10_PAD}{Hold \ButtonLeft} + \opt{IRIVER_H10_PAD}{Long \ButtonLeft} \opt{SANSA_E200_PAD}{\ButtonRec} \opt{SANSA_C200_PAD}{\ButtonVolDown} & If a card was selected -- unselect it, else\\ & Draw 3 new cards from the remains stack\\ % \opt{RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay} - \opt{ONDIO_PAD}{Hold \ButtonDown} + \opt{ONDIO_PAD}{Long \ButtonDown} \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn + \ButtonLeft} - \opt{IAUDIO_X5_PAD}{Hold \ButtonPlay} + \opt{IAUDIO_X5_PAD}{Long \ButtonPlay} \opt{IRIVER_H10_PAD}{\ButtonFF} \opt{SANSA_E200_PAD}{\ButtonLeft} \opt{SANSA_C200_PAD}{\ButtonRec} @@ -50,16 +50,16 @@ visit\\ & Put the card from the top of the remains stack on top of the cursor\\ % \opt{RECORDER_PAD}{\ButtonFTwo} - \opt{ONDIO_PAD}{Hold \ButtonUp} - \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,SANSA_C200_PAD}{Hold \ButtonSelect} - \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Hold \ButtonMenu} - \opt{IAUDIO_X5_PAD}{Hold \ButtonSelect} + \opt{ONDIO_PAD}{Long \ButtonUp} + \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,SANSA_C200_PAD}{Long \ButtonSelect} + \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonMenu} + \opt{IAUDIO_X5_PAD}{Long \ButtonSelect} \opt{IRIVER_H10_PAD}{\ButtonRew} \opt{SANSA_E200_PAD}{\ButtonRec+\ButtonRight} & Put the card under the cursor on one of the 4 final colour stacks.\\ % \opt{RECORDER_PAD}{\ButtonFThree} - \opt{IRIVER_H10_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{Hold \ButtonRight} + \opt{IRIVER_H10_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonRight} \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn + \ButtonRight} \opt{IAUDIO_X5_PAD}{\ButtonRec} \opt{SANSA_E200_PAD}{\ButtonRight} diff --git a/manual/plugins/vumeter.tex b/manual/plugins/vumeter.tex index 4745ed7ad..98a06037c 100644 --- a/manual/plugins/vumeter.tex +++ b/manual/plugins/vumeter.tex @@ -21,7 +21,7 @@ and the meter scale can be changed. \opt{SANSA_E200_PAD}{\ButtonRec} & Help\\ \opt{RECORDER_PAD}{\ButtonFOne} -\opt{ONDIO_PAD}{Hold \ButtonMenu} +\opt{ONDIO_PAD}{Long \ButtonMenu} \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonSelect} \opt{IRIVER_H10_PAD}{\ButtonRew} & Settings\\ diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex index 2c4dc08af..807b6a00f 100644 --- a/manual/rockbox_interface/browsing_and_playing.tex +++ b/manual/rockbox_interface/browsing_and_playing.tex @@ -239,7 +239,7 @@ This is the virtual keyboard that is used when entering text in Rockbox, for you get to the line edit mode. \\ \ButtonMenu & Selects the letter underneath the cursor. \\ - Hold \ButtonMenu + Long \ButtonMenu & Accepts the change and returns to the File Browser.\\ \ButtonOff & Quit the virtual keyboard without saving the changes.\\ @@ -249,7 +249,7 @@ This is the virtual keyboard that is used when entering text in Rockbox, for \begin{btnmap}{Line edit mode}{} \ButtonLeft/\ButtonRight & Move left and right\\ \ButtonMenu & Deletes the letter to the left of the cursor\\ - Hold \ButtonMenu & Accepts the deletion\\ + Long \ButtonMenu & Accepts the deletion\\ \ButtonUp/\ButtonDown & Returns to the picker area\\ \end{btnmap} \end{table} @@ -266,7 +266,7 @@ This is the virtual keyboard that is used when entering text in Rockbox, for & line (picker of input line) \\ \ButtonPlay & Picks character in character bar, or acts as backspace \\ & in the text line.\\ - Hold \ButtonPlay & Accept\\ + Long \ButtonPlay & Accept\\ \ButtonStop & Cancel\\ \ButtonMenu & Flips picker lines\\ \end{btnmap} diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex index d589d522c..643f66236 100644 --- a/manual/rockbox_interface/main.tex +++ b/manual/rockbox_interface/main.tex @@ -267,17 +267,17 @@ To turn on and off your Rockbox enabled \dap{} use the following keys: \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}% \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu{} / \ButtonSelect}% \opt{ONDIO_PAD}{\ButtonOff}\opt{RECORDER_PAD,PLAYER_PAD}% - {Hold \ButtonOn\ for 2--3s}% + {Long \ButtonOn}% \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD} {\ButtonPower}% & Start Rockbox\\ - \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{Hold \ButtonOff}% - \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Hold \ButtonPlay}% - \opt{ONDIO_PAD,recorderv2fm}{Hold \ButtonOff}% + \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{Long \ButtonOff}% + \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonPlay}% + \opt{ONDIO_PAD,recorderv2fm}{Long \ButtonOff}% \opt{recorder}{Double tap \ButtonOff\ when playback is stopped}% \opt{PLAYER_PAD}{From the Main Menu, select \textbf{Shutdown}}% \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}% - {Hold \ButtonPower}% + {Long \ButtonPower}% & Shutdown Rockbox\\ \end{btnmap} \end{table} diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex index b7ceff04b..174207180 100644 --- a/manual/rockbox_interface/wps.tex +++ b/manual/rockbox_interface/wps.tex @@ -98,7 +98,7 @@ your WPS (While Playing Screen). \ButtonMenu+\ButtonPlay & Mute on/off.\\% }% \opt{ONDIO_PAD}{% - Hold \ButtonMenu+\ButtonDown & Key lock on/off.\\% + Long \ButtonMenu+\ButtonDown & Key lock on/off.\\% }% \opt{PLAYER_PAD,RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IRIVER_H10_PAD}{% \ActionWpsIdThreeScreen & Enter \setting{ID3 Viewer}.\\% -- 2.11.4.GIT