diff options
| -rw-r--r-- | res/layout/act_generatepubkey.xml | 247 | ||||
| -rw-r--r-- | res/layout/act_hostlist.xml | 110 | ||||
| -rw-r--r-- | res/values/strings.xml | 8 |
3 files changed, 222 insertions, 143 deletions
diff --git a/res/layout/act_generatepubkey.xml b/res/layout/act_generatepubkey.xml index 0b0ae5a..b5a5fe6 100644 --- a/res/layout/act_generatepubkey.xml +++ b/res/layout/act_generatepubkey.xml @@ -1,90 +1,167 @@ <?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/>. + 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_height="wrap_content" - android:scrollbars="vertical" android:layout_width="fill_parent"> - - <TableLayout - android:orientation="vertical" - android:layout_height="wrap_content" - android:paddingLeft="10dip" - android:paddingRight="10dip" - android:scrollbars="vertical" android:layout_width="fill_parent"> - - <TableRow> - <TextView android:text="Nickname:" android:paddingRight="10dip" android:gravity="right|center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" /> - <EditText android:id="@+id/nickname" android:hint="My work key" android:layout_height="wrap_content" android:singleLine="true" android:layout_weight="1"/> - </TableRow> - - <TableRow> - <TextView android:text="Type:" android:paddingRight="10dip" android:textAppearance="?android:attr/textAppearanceMedium" android:gravity="bottom|right" android:layout_gravity="center_vertical"/> - <RadioGroup - android:id="@+id/key_type" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:checkedButton="@+id/rsa"> - - <RadioButton - android:id="@+id/rsa" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="RSA" - android:paddingRight="30dip" - /> - - <RadioButton - android:id="@+id/dsa" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="DSA" - /> - - </RadioGroup> - </TableRow> - - <TableRow> - <TextView android:text="Bits:" android:paddingRight="10dip" android:textAppearance="?android:attr/textAppearanceMedium" android:gravity="right|center_vertical" /> - <EditText android:id="@+id/bits" android:layout_height="wrap_content" android:text="1024" android:numeric="integer" android:singleLine="true" android:layout_weight="1"/> - </TableRow> - - <SeekBar android:layout_height="wrap_content" android:id="@+id/bits_slider" android:layout_width="fill_parent" android:paddingBottom="10dip" android:max="3328" android:progress="256"/> - - <TextView android:text="Note: password can be blank" android:gravity="left" android:layout_height="wrap_content" android:layout_width="wrap_content" /> - - <TableRow> - <TextView android:paddingRight="10dip" android:gravity="right|center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" android:text="Password:" /> - <EditText android:id="@+id/password1" android:layout_width="wrap_content" android:layout_height="wrap_content" android:password="true" android:singleLine="true" android:layout_weight="1"/> - </TableRow> - - <TableRow> - <LinearLayout android:paddingRight="10dip" android:orientation="vertical" android:gravity="right|center_vertical" > - <TextView android:gravity="right|bottom" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" android:text="Password:" /> - <TextView android:gravity="right|top" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceSmall" android:text="(again)" /> - </LinearLayout> - <EditText android:id="@+id/password2" android:layout_width="wrap_content" android:layout_height="wrap_content" android:password="true" android:singleLine="true" android:layout_weight="1"/> - </TableRow> - - <CheckBox android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/unlock_at_startup" android:text="Unlock when ConnectBot starts"/> - - <Button android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/save" android:text="Save" android:enabled="false"/> - - </TableLayout> +<ScrollView + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_height="wrap_content" + android:scrollbars="vertical" + android:layout_width="fill_parent"> + + <TableLayout + android:orientation="vertical" + android:layout_height="wrap_content" + android:paddingLeft="10dip" + android:paddingRight="10dip" + android:scrollbars="vertical" + android:layout_width="fill_parent"> + + <TableRow> + <TextView + android:text="@string/prompt_nickname" + android:paddingRight="10dip" + android:gravity="right|center_vertical" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <EditText + android:id="@+id/nickname" + android:hint="@string/prompt_nickname_hint_pubkey" + android:layout_height="wrap_content" + android:singleLine="true" + android:layout_weight="1" /> + </TableRow> + + <TableRow> + <TextView + android:text="@string/prompt_type" + android:paddingRight="10dip" + android:textAppearance="?android:attr/textAppearanceMedium" + android:gravity="bottom|right" + android:layout_gravity="center_vertical" /> + + <RadioGroup + android:id="@+id/key_type" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:checkedButton="@+id/rsa"> + + <RadioButton + android:id="@+id/rsa" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="RSA" + android:paddingRight="30dip" /> + + <RadioButton + android:id="@+id/dsa" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="DSA" /> + </RadioGroup> + </TableRow> + + <TableRow> + <TextView + android:text="@string/prompt_bits" + android:paddingRight="10dip" + android:textAppearance="?android:attr/textAppearanceMedium" + android:gravity="right|center_vertical" /> + + <EditText + android:id="@+id/bits" + android:layout_height="wrap_content" + android:text="1024" + android:numeric="integer" + android:singleLine="true" + android:layout_weight="1" /> + </TableRow> + + <SeekBar + android:layout_height="wrap_content" + android:id="@+id/bits_slider" + android:layout_width="fill_parent" + android:paddingBottom="10dip" + android:max="3328" + android:progress="256" /> + + <TextView + android:text="@string/prompt_password_can_be_blank" + android:gravity="left" + android:layout_height="wrap_content" + android:layout_width="wrap_content" /> + + <TableRow> + <TextView + android:paddingRight="10dip" + android:gravity="right|center_vertical" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/prompt_password" /> + + <EditText + android:id="@+id/password1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:password="true" + android:singleLine="true" + android:layout_weight="1" /> + </TableRow> + + <TableRow> + <LinearLayout + android:paddingRight="10dip" + android:orientation="vertical" + android:gravity="right|center_vertical"> + + <TextView + android:gravity="right|bottom" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/prompt_password" /> + + <TextView + android:gravity="right|top" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceSmall" + android:text="@string/prompt_again" /> + </LinearLayout> + + <EditText + android:id="@+id/password2" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:password="true" + android:singleLine="true" + android:layout_weight="1" /> + </TableRow> + + <CheckBox + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/unlock_at_startup" + android:text="@string/pubkey_load_on_start" /> + + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/save" + android:text="@string/pubkey_generate" + android:enabled="false" /> + </TableLayout> </ScrollView>
\ No newline at end of file diff --git a/res/layout/act_hostlist.xml b/res/layout/act_hostlist.xml index 6959dfb..091ae3e 100644 --- a/res/layout/act_hostlist.xml +++ b/res/layout/act_hostlist.xml @@ -1,63 +1,57 @@ <?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/>. + 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" - > - - <RelativeLayout - android:layout_width="fill_parent" - android:layout_height="0dip" - android:layout_weight="1" - > - - <ListView android:id="@android:id/list" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - /> - - <TextView android:id="@android:id/empty" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:text="@string/list_host_empty" - android:textAppearance="?android:attr/textAppearanceMedium" - android:gravity="center" - /> - - </RelativeLayout> - - <FrameLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:padding="5dip" - > - - <EditText - android:id="@+id/front_quickconnect" - android:singleLine="true" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:hint="user@hostname" - /> - - </FrameLayout> - +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent"> + + <RelativeLayout + android:layout_width="fill_parent" + android:layout_height="0dip" + android:layout_weight="1"> + + <ListView + android:id="@android:id/list" + android:layout_width="fill_parent" + android:layout_height="fill_parent" /> + + <TextView + android:id="@android:id/empty" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:text="@string/list_host_empty" + android:textAppearance="?android:attr/textAppearanceMedium" + android:gravity="center" /> + + </RelativeLayout> + + <FrameLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:padding="5dip"> + + <EditText + android:id="@+id/front_quickconnect" + android:singleLine="true" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:hint="@string/hint_userhost" /> + + </FrameLayout> + </LinearLayout> diff --git a/res/values/strings.xml b/res/values/strings.xml index dbdab92..bb6c204 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -57,6 +57,8 @@ <string name="portforward_delete">Delete port forward</string> <string name="prompt_nickname">Nickname:</string> + <!-- An example string that could be used as a nickname for a pubkey. --> + <string name="prompt_nickname_hint_pubkey">My work key</string> <!-- The source TCP port for port forwards. --> <string name="prompt_source_port">Source port:</string> <!-- The "host:port" combination used for port forward destinations. --> @@ -67,6 +69,9 @@ <string name="prompt_again">(again)</string> <!-- Label for the user to select port forward type. --> <string name="prompt_type">Type:</string> + <string name="prompt_password_can_be_blank">Note: password can be blank</string> + <!-- Prompt for the size of the private key in bits. --> + <string name="prompt_bits">Bits:</string> <string name="alert_passwords_do_not_match_msg">Passwords do not match!</string> <string name="alert_wrong_password_msg">Wrong password!</string> @@ -177,6 +182,9 @@ <string name="portforward_menu_add">Add port forward</string> + <!-- The string to present in the quick-connect box to hint the user to the format for connecting to hosts. --> + <string name="hint_userhost">user@hostname</string> + <string name="list_format_error">Use the format 'username@hostname:port'</string> <string name="list_menu_pubkeys">Manage Pubkeys</string> |