aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/drawable/keyboard.jpgbin20844 -> 0 bytes
-rw-r--r--res/layout/act_help.xml45
-rw-r--r--res/layout/act_help_topic.xml32
-rw-r--r--res/layout/wiz_features.xml68
-rw-r--r--res/layout/wiz_keyboard.xml89
-rw-r--r--res/values/arrays.xml4
-rw-r--r--res/values/strings.xml13
7 files changed, 89 insertions, 162 deletions
diff --git a/res/drawable/keyboard.jpg b/res/drawable/keyboard.jpg
deleted file mode 100644
index 4083577..0000000
--- a/res/drawable/keyboard.jpg
+++ /dev/null
Binary files differ
diff --git a/res/layout/act_help.xml b/res/layout/act_help.xml
new file mode 100644
index 0000000..4a61200
--- /dev/null
+++ b/res/layout/act_help.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ConnectBot: simple, powerful, open-source SSH client for Android
+ Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<ScrollView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ >
+
+ <LinearLayout
+ android:id="@+id/topics"
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:gravity="center_horizontal"
+ >
+
+ <TextView
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/help_intro"
+ android:paddingTop="10dip"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:gravity="center_horizontal"
+ />
+
+ </LinearLayout>
+</ScrollView> \ No newline at end of file
diff --git a/res/layout/act_help_topic.xml b/res/layout/act_help_topic.xml
new file mode 100644
index 0000000..1b59589
--- /dev/null
+++ b/res/layout/act_help_topic.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ConnectBot: simple, powerful, open-source SSH client for Android
+ Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ >
+
+ <HelpTopicView
+ android:id="@+id/topic_text"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ />
+
+</LinearLayout>
diff --git a/res/layout/wiz_features.xml b/res/layout/wiz_features.xml
deleted file mode 100644
index c372010..0000000
--- a/res/layout/wiz_features.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ConnectBot: simple, powerful, open-source SSH client for Android
- Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
--->
-<ScrollView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- >
-
-<LinearLayout
- android:orientation="vertical"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:padding="10dip"
- >
-
- <TextView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="Helpful hints"
- android:textAppearance="?android:attr/textAppearanceLarge"
- android:paddingBottom="10dip"
- android:textStyle="bold"
- />
-
- <TextView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="When you have multiple sessions open, you can 'pan' between them by swiping your finger left-to-right or right-to-left over the screen."
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:paddingBottom="15dip"
- />
-
- <TextView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="Long-press on your Android desktop to create direct shortcuts to frequently-used SSH hosts."
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:paddingBottom="15dip"
- />
-
- <TextView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="Slide your finger up/down on the right-half of the terminal screen to look at the scrollback history. Slide up/down on the left-half to send the page up/down keys."
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:paddingBottom="15dip"
- />
-
-</LinearLayout>
-
-</ScrollView> \ No newline at end of file
diff --git a/res/layout/wiz_keyboard.xml b/res/layout/wiz_keyboard.xml
deleted file mode 100644
index b51bb62..0000000
--- a/res/layout/wiz_keyboard.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ConnectBot: simple, powerful, open-source SSH client for Android
- Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
--->
-<ScrollView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- >
-
-<LinearLayout
- android:orientation="vertical"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:padding="10dip"
- >
-
- <TextView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="Keyboard magic"
- android:textAppearance="?android:attr/textAppearanceLarge"
- android:paddingBottom="10dip"
- android:textStyle="bold"
- />
-
- <ImageView
- android:layout_width="fill_parent"
- android:layout_height="150dip"
- android:src="@drawable/keyboard"
- android:paddingBottom="10dip"
- />
-
-
- <TableLayout
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- >
-
- <TableRow>
- <TextView android:text="Volume key" android:paddingRight="10dip" android:gravity="right|center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" android:textStyle="bold" />
- <TextView android:text="Tap up/down to\nchange font size\nin console" android:textAppearance="?android:attr/textAppearanceMedium" android:paddingBottom="10dip" />
- </TableRow>
-
- <TableRow>
- <TextView android:text="Right alt" android:paddingRight="10dip" android:gravity="right|center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" android:textStyle="bold" />
- <TextView android:text="Tap for '/'" android:textAppearance="?android:attr/textAppearanceMedium" android:paddingBottom="10dip" />
- </TableRow>
-
- <TableRow>
- <TextView android:text="Right shift" android:paddingRight="10dip" android:gravity="right|center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" android:textStyle="bold" />
- <TextView android:text="Tap for 'TAB' key" android:textAppearance="?android:attr/textAppearanceMedium" android:paddingBottom="10dip" />
- </TableRow>
-
- <TableRow>
- <TextView android:text="Trackball" android:paddingRight="10dip" android:gravity="right|center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" android:textStyle="bold" />
- <TextView android:text="Tap once to toggle\nCTRL on, twice\nto send Esc" android:textAppearance="?android:attr/textAppearanceMedium" android:paddingBottom="10dip" />
- </TableRow>
-
- <TableRow>
- <TextView android:text="Left shift" android:paddingRight="10dip" android:gravity="right|center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" android:textStyle="bold" />
- <TextView android:text="Hold left shift and\ntap number for\nF1, F2, etc" android:textAppearance="?android:attr/textAppearanceMedium" android:paddingBottom="10dip" />
- </TableRow>
-
- <TableRow>
- <TextView android:text="Picture key" android:paddingRight="10dip" android:gravity="right|center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" android:textStyle="bold" />
- <TextView android:text="Tap to send Ctrl+A\nSpace (for 'screen'\nusers)" android:textAppearance="?android:attr/textAppearanceMedium" android:paddingBottom="10dip" />
- </TableRow>
-
- </TableLayout>
-
-</LinearLayout>
-
-</ScrollView> \ No newline at end of file
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index fd550f9..4ebe58c 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -50,4 +50,8 @@
<item value="dynamic">@string/portforward_dynamic</item>
</string-array>
+ <string-array name="list_wizard_topics">
+ <item>Hints</item>
+ <item>Keyboard</item>
+ </string-array>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bdaa957..f08d7a5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7,6 +7,7 @@
<string name="title_pubkey_list">Pubkeys</string>
<string name="title_port_forwards_list">Port forwards</string>
<string name="title_host_editor">Edit Host</string>
+ <string name="title_help">Help</string>
<string name="title_password">Input Password</string>
<string name="title_entropy">Gathering Entropy</string>
@@ -18,8 +19,13 @@
<string name="menu_insert">Add Host</string>
<string name="menu_delete">Delete Host</string>
<string name="menu_preferences">Preferences</string>
+ <string name="menu_help">Help</string>
- <string name="menu_about">About</string>
+ <string name="help_intro">Please select a topic below for more information on a particular subject.</string>
+ <string name="help_about">About ConnectBot</string>
+ <string name="help_keyboard">Keyboard</string>
+ <string name="help_pubkeys">Pubkeys</string>
+ <string name="help_portforwards">Port Forwards</string>
<string name="pubkey_generate">Generate</string>
<string name="pubkey_import">Import</string>
@@ -126,7 +132,7 @@
<string name="list_menu_sortcolor">Sort by color</string>
<string name="list_menu_sortname">Sort by name</string>
<string name="list_menu_settings">Settings</string>
- <string name="list_menu_about">About</string>
+ <string name="list_menu_help">Help</string>
<string name="list_host_disconnect">Disconnect</string>
<string name="list_host_edit">Edit host</string>
@@ -172,7 +178,4 @@
<string name="upgrade_pos">Yes, upgrade</string>
<string name="upgrade_neg">Not right now</string>
-
-
-
</resources>