diff options
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | assets/help/Keyboard.html | 39 | ||||
| -rw-r--r-- | assets/help/PhysicalKeyboard.html | 62 | ||||
| -rw-r--r-- | assets/help/ScreenGestures.html | 38 | ||||
| -rw-r--r-- | assets/help/VirtualKeyboard.html | 49 | ||||
| -rw-r--r-- | assets/help/i/keyboard.jpg | bin | 20844 -> 0 bytes | |||
| -rw-r--r-- | res/values/arrays.xml | 3 |
7 files changed, 152 insertions, 41 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7cdfc1a..390d5b6 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,7 +2,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.connectbot" android:versionName="1.6-dev" - android:versionCode="194"> + android:versionCode="195"> <application android:icon="@drawable/icon" diff --git a/assets/help/Keyboard.html b/assets/help/Keyboard.html deleted file mode 100644 index 94f2f67..0000000 --- a/assets/help/Keyboard.html +++ /dev/null @@ -1,39 +0,0 @@ -<html> -<body style="background-color: #000; color: #fff"> - -<h2>Keyboard magic</h2> -<img src="i/keyboard.jpg" width="100%" /> -<table style="width: 100%"> - <tr> - <th>Volume key</th> - <td>Tap up/down to change font size in console</td> - </tr> - - <tr> - <th>Right alt</th> - <td>Tap for '/'</td> - </tr> - - <tr> - <th>Right shift</th> - <td>Tap for 'TAB' key</td> - </tr> - - <tr> - <th>Trackball</th> - <td>Tap once to toggle CTRL on, twice to send Esc</td> - </tr> - - <tr> - <th>Left shift</th> - <td>Hold left shift and tap number for F1, F2, etc</td> - </tr> - - <tr> - <th>Picture key</th> - <td>Tap to send Ctrl+A Space (for 'screen' users)</td> - </tr> -</table> - -</body> -</html> diff --git a/assets/help/PhysicalKeyboard.html b/assets/help/PhysicalKeyboard.html new file mode 100644 index 0000000..4ff3753 --- /dev/null +++ b/assets/help/PhysicalKeyboard.html @@ -0,0 +1,62 @@ +<html> +<body style="background-color: #000; color: #fff"> + +<p><img + src="http://connectbot.googlecode.com/svn/trunk/www/keyboard.jpg" /></p> +<p>Here are some keyboard shortcuts available when a <strong>hardware +keyboard</strong> is present. If you're using a phone where the main input +type is a <strong>virtual keyboard</strong>, please see the VirtualKeyboard help topic. +</p> +<p><strong>Note:</strong> the side that <strong>shift</strong>, <strong>alt</strong>, +<strong>slash</strong>, and <strong>tab</strong> uses can be changed in +preferences between left, right, and disabled.</p> +<ul> + <li>Control key (CTRL)</li> + <blockquote>Pressing once on the trackball will toggle on + <strong>control</strong> for the next character typed. The cursor will + indicate this state with a < symbol. Note that pressing the + trackball again will send an <strong>escape</strong> key.</blockquote> +</ul> +<ul> + <li>Escape (ESC)</li> + <blockquote>Pressing twice on the trackball will send <strong>escape</strong> + key. Note that some other terminal emulators map pressing <strong>ALT-<i>key</i></strong> + to <strong>escape + <i>key</i></strong>.</blockquote> +</ul> +<ul> + <li>Shift</li> + <blockquote>Pressing the <strong>shift</strong> (up arrow) + key once will make the next key typed its uppercase variant according + to the keyboard layout. This state is indicated with an outline of a + triangle on the top of the cursor. Pressing it twice will turn on <strong>shift + lock</strong> which is indicated by a solid triangle on the top of the cursor.</blockquote> +</ul> +<ul> + <li>Alt</li> + <blockquote>Pressing the <strong>Alt</strong> key once + will make the next key typed its symbol as indicated on the keyboard. + This state is indicated with the outline of a triangle on the bottom of + the cursor. Pressing it twice will turn on <strong>alt lock</strong> + which is indicated by a solid triangle on the bottom of the cursor.</blockquote> +</ul> +<ul> + <li>Slash (opposite side Alt)</li> + <blockquote>The opposite side <strong>alt</strong> key can + be used as a shortcut for the forward slash / character. This aids in + quickly typing directories on the G1.</blockquote> +</ul> +<ul> + <li>Tab (opposite side Shift)</li> + <blockquote>The opposite side <strong>shift</strong> key + can be used as a shortcut for the <strong>tab</strong> key (CTRL-i) for + quick completion in many shells.</blockquote> +</ul> +<ul> + <li>Function keys (F1 through F10)</li> + <blockquote>Hold down the shift key and press numbers 1 + through 10 to send F1 through F10 respectively.</blockquote> +</ul> + + +</body> +</html> diff --git a/assets/help/ScreenGestures.html b/assets/help/ScreenGestures.html new file mode 100644 index 0000000..9332821 --- /dev/null +++ b/assets/help/ScreenGestures.html @@ -0,0 +1,38 @@ +<html> +<body style="background-color: #000; color: #fff"> + +<p>Gestures in ConnectBot allow a user to do several things for +which there's no keyboard equivalent. If the gestures seem +backward, then imagine that you're grabbing the text and moving it +with your finger.</p> +<h1><a name="Page_Up_/_Page_Down" />Page Up / Page Down</h1> +<p>Swiping your finger up and down on the left third of the screen +will send a page up and page down key to the remote host. Many programs +map this to scrolling back into history such as irssi or tinyfugue.</p> +<p><img + src="http://connectbot.googlecode.com/svn/trunk/www/gesture-pgup.png" /> +Page Up gesture</p> +<p><img + src="http://connectbot.googlecode.com/svn/trunk/www/gesture-pgdn.png" /> +Page Down gesture</p> +<h1><a name="Scroll_back_/_Scroll_forward" />Scroll back / Scroll +forward</h1> +<p>Swiping your finger up on the right side of the screen allows you +to scroll backward and forward in the local terminal buffer history.</p> +<p><img + src="http://connectbot.googlecode.com/svn/trunk/www/gesture-scrollback.png" /> +Scroll back gesture</p> +<p><img + src="http://connectbot.googlecode.com/svn/trunk/www/gesture-scrollforward.png" /> +Scroll forward gesture</p> +<h1><a name="Switching_hosts" />Switching hosts</h1> +<p>Swiping your finger from one side of the screen to the other will +switch between currently connected hosts.</p> +<p><img + src="http://connectbot.googlecode.com/svn/trunk/www/gesture-hostprev.png" /> +Previous host gesture</p> +<p><img + src="http://connectbot.googlecode.com/svn/trunk/www/gesture-hostnext.png" /> +Next host gesture</p> +</body> +</html>
\ No newline at end of file diff --git a/assets/help/VirtualKeyboard.html b/assets/help/VirtualKeyboard.html new file mode 100644 index 0000000..9788161 --- /dev/null +++ b/assets/help/VirtualKeyboard.html @@ -0,0 +1,49 @@ +<html> +<body style="background-color: #000; color: #fff"> + +<p><img src="http://connectbot.googlecode.com/svn/trunk/www/magic-cb-screen.png" width="100%" /></p> + +<h2>Caveats</h2> +<p>Since ConnectBot doesn't use any of the normal TextView +widgets, Android's IME structure isn't designed to directly +support it.</p> +<p>The best way to use Android with a virtual keyboard is in <strong>Portrait</strong> +mode. By default, ConnectBot is set to use <strong>Portrait</strong> +mode when no hardware keyboard is present. To change this setting, go to +<strong>Preferences</strong> from the <strong>Host List</strong>.</p> +<p>In <strong>Landscape</strong> mode, the Android virtual keyboard +(or other IMEs) will take up the entire screen. Android provides no way +for ConnectBot to resize the terminal view in <strong>Landscape</strong>. +However, you may use a <i>work-around</i>: <strong>Force Resize</strong> +to fit above the virtual keyboard if desired.</p> +<p>On devices without a hardware keyboard, you may press and hold +the <strong>MENU</strong> button to bring up the virtual keyboard. NOTE: +This applies to any program on the Android platform; it is not +ConnectBot specific.</p> +<h2>How to Enter Control, Alt, Escape, and Function Keys</h2> +<p>You can enter any key combination with ConnectBot and the virtual +keyboard, but you must know how keys are mapped on a normal console. For +instance, usually combinations of ALT+letter on a PC keyboard are +actually mapped to sending, sequentially, ESC key then the letter.</p> +<p>Note there are also screen gestures: see the ScreenGestures help topic.</a> +for <strong>Page Up</strong> and <strong>Page Down</strong>.</p> +<ul> + <li>Trackball: 1 press is <strong>CTRL</strong>, 2 presses sends <strong>ESC</strong> + </li> + <li><strong>Tab key</strong> = <strong>CTRL + i</strong></li> + <li><strong>Function key</strong> = <strong>CTRL + number</strong> + </li> +</ul> +<h2>Examples</h2> +<ul> + <li><strong>ESC</strong> = Press the trackball twice.</li> + <li><strong>ALT + Right Arrow</strong> = Press trackball twice + then move trackball to right.</li> + <li><strong>CTRL + A</strong> = Press trackball once then tap the + "A" key on the soft keyboard.</li> + <li><strong>F3</strong> = Press trackball once then tap the + "3" key on the soft keyboard.</li> +</ul> + +</body> +</html> diff --git a/assets/help/i/keyboard.jpg b/assets/help/i/keyboard.jpg Binary files differdeleted file mode 100644 index 4083577..0000000 --- a/assets/help/i/keyboard.jpg +++ /dev/null diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 6356d1c..bdcdb39 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -106,7 +106,8 @@ <string-array name="list_wizard_topics"> <item>Hints</item> - <item>Keyboard</item> + <item>PhysicalKeyboard</item> + <item>VirtualKeyboard</item> </string-array> <string-array name="list_delkey"> |
