Mercurial > 510Connectbot

diff res/xml/host_prefs.xml @ 79:01d939969b10

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge tn5250 branch into default
author Carl Byington <carl@five-ten-sg.com>
date Mon, 16 Jun 2014 08:24:00 -0700
parents c8f45608d94c
children 3f587bd647a5
line wrap: on
line diff
--- a/res/xml/host_prefs.xml	Tue Jun 03 08:48:14 2014 -0700
+++ b/res/xml/host_prefs.xml	Mon Jun 16 08:24:00 2014 -0700
@@ -20,141 +20,156 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-	<EditTextPreference
-		android:key="nickname"
-		android:title="@string/hostpref_nickname_title"
-		android:singleLine="true"
-		/>
+    <EditTextPreference
+        android:key="nickname"
+        android:title="@string/hostpref_nickname_title"
+        android:singleLine="true"
+        />
 
-	<ListPreference
-		android:key="color"
-		android:title="@string/hostpref_color_title"
-		android:entries="@array/list_colors"
-		android:entryValues="@array/list_color_values"
-		/>
+    <ListPreference
+        android:key="color"
+        android:title="@string/hostpref_color_title"
+        android:entries="@array/list_colors"
+        android:entryValues="@array/list_color_values"
+        />
 
-	<EditTextPreference
-		android:key="fontsize"
-		android:title="@string/hostpref_fontsize_title"
-		android:inputType="number"
-		android:singleLine="true"
-		/>
+    <EditTextPreference
+        android:key="fontsize"
+        android:title="@string/hostpref_fontsize_title"
+        android:inputType="number"
+        android:singleLine="true"
+        />
 
 <!--
-	<CheckBoxPreference
-		android:key="usekeys"
-		android:title="Use SSH keys"
-		/>
+    <CheckBoxPreference
+        android:key="usekeys"
+        android:title="Use SSH keys"
+        />
 -->
 
-	<ListPreference
-		android:key="pubkeyid"
-		android:title="@string/hostpref_pubkeyid_title"
-		android:entries="@array/list_pubkeyids"
-		android:entryValues="@array/list_pubkeyids_value"
-		/>
+    <ListPreference
+        android:key="pubkeyid"
+        android:title="@string/hostpref_pubkeyid_title"
+        android:entries="@array/list_pubkeyids"
+        android:entryValues="@array/list_pubkeyids_value"
+        />
 
-	<ListPreference
-		android:key="useauthagent"
-		android:title="@string/hostpref_authagent_title"
-		android:entries="@array/list_authagent"
-		android:entryValues="@array/list_authagent_values"
-		/>
+    <ListPreference
+        android:key="useauthagent"
+        android:title="@string/hostpref_authagent_title"
+        android:entries="@array/list_authagent"
+        android:entryValues="@array/list_authagent_values"
+        />
 
-	<EditTextPreference
-		android:key="postlogin"
-		android:title="@string/hostpref_postlogin_title"
-		android:summary="@string/hostpref_postlogin_summary"
-		/>
+    <EditTextPreference
+        android:key="postlogin"
+        android:title="@string/hostpref_postlogin_title"
+        android:summary="@string/hostpref_postlogin_summary"
+        />
 
-	<CheckBoxPreference
-		android:key="compression"
-		android:title="@string/hostpref_compression_title"
-		android:summary="@string/hostpref_compression_summary"
-		/>
+    <CheckBoxPreference
+        android:key="compression"
+        android:title="@string/hostpref_compression_title"
+        android:summary="@string/hostpref_compression_summary"
+        />
 
-	<EditTextPreference
-		android:key="httpproxy"
-		android:title="@string/hostpref_httpproxy_title"
-		android:summary="@string/hostpref_httpproxy_summary"
-		android:inputType="textUri"
-		/>
+    <EditTextPreference
+        android:key="httpproxy"
+        android:title="@string/hostpref_httpproxy_title"
+        android:summary="@string/hostpref_httpproxy_summary"
+        android:inputType="textUri"
+        />
 
-	<CheckBoxPreference
-		android:key="wantsession"
-		android:title="@string/hostpref_wantsession_title"
-		android:summary="@string/hostpref_wantsession_summary"
-		/>
+    <CheckBoxPreference
+        android:key="wantsession"
+        android:title="@string/hostpref_wantsession_title"
+        android:summary="@string/hostpref_wantsession_summary"
+        />
 
-	<CheckBoxPreference
-		android:key="stayconnected"
-		android:title="@string/hostpref_stayconnected_title"
-		android:summary="@string/hostpref_stayconnected_summary"
-		/>
+    <CheckBoxPreference
+        android:key="stayconnected"
+        android:title="@string/hostpref_stayconnected_title"
+        android:summary="@string/hostpref_stayconnected_summary"
+        />
 
-	<ListPreference
-		android:key="delkey"
-		android:title="@string/hostpref_delkey_title"
-		android:summary="@string/hostpref_delkey_summary"
-		android:entries="@array/list_delkey"
-		android:entryValues="@array/list_delkey_values"
-		/>
+    <ListPreference
+        android:key="delkey"
+        android:title="@string/hostpref_delkey_title"
+        android:summary="@string/hostpref_delkey_summary"
+        android:entries="@array/list_delkey"
+        android:entryValues="@array/list_delkey_values"
+        />
+
+    <ListPreference
+        android:key="encoding"
+        android:title="@string/hostpref_encoding_title"
+        android:summary="@string/hostpref_encoding_summary"
+        />
+
+    <PreferenceCategory
+        android:title="@string/hostpref_connection_category">
 
-	<ListPreference
-		android:key="encoding"
-		android:title="@string/hostpref_encoding_title"
-		android:summary="@string/hostpref_encoding_summary"
-		/>
+        <EditTextPreference
+            android:key="username"
+            android:title="@string/hostpref_username_title"
+            android:singleLine="true"
+            />
 
-	<PreferenceCategory
-		android:title="@string/hostpref_connection_category">
+        <EditTextPreference
+            android:key="hostname"
+            android:title="@string/hostpref_hostname_title"
+            android:singleLine="true"
+            />
 
-		<EditTextPreference
-			android:key="username"
-			android:title="@string/hostpref_username_title"
-			android:singleLine="true"
-			/>
+        <EditTextPreference
+            android:key="port"
+            android:title="@string/hostpref_port_title"
+            android:numeric="integer"
+            />
 
-		<EditTextPreference
-			android:key="hostname"
-			android:title="@string/hostpref_hostname_title"
-			android:singleLine="true"
-			/>
+        <EditTextPreference
+            android:key="monitor"
+            android:title="@string/hostpref_monitor_title"
+            android:singleLine="true"
+            />
 
-		<EditTextPreference
-			android:key="port"
-			android:title="@string/hostpref_port_title"
-			android:numeric="integer"
-			/>
+        <EditTextPreference
+            android:key="emulation"
+            android:title="@string/hostpref_emulation_title"
+            android:summary="@string/hostpref_emulation_summary"
+            android:singleLine="true"
+            />
 
-		<EditTextPreference
-			android:key="monitor"
-			android:title="@string/hostpref_monitor_title"
-			android:singleLine="true"
-			/>
-	</PreferenceCategory>
+        <ListPreference
+            android:key="encryption5250"
+            android:title="@string/hostpref_5250_encryption_title"
+			android:entries="@array/list_5250_encryption_modes"
+			android:entryValues="@array/list_5250_encryption_modes"
+            />
+    </PreferenceCategory>
 
-	<PreferenceCategory
-	    android:title="@string/hostpref_x11_forwarding">
+
+    <PreferenceCategory
+        android:title="@string/hostpref_x11_forwarding">
 
-		<CheckBoxPreference
-			android:key="wantx11forward"
-			android:title="@string/hostpref_wantx11forward_title"
-			android:summary="@string/hostpref_wantx11forward_summary"
-		/>
+        <CheckBoxPreference
+            android:key="wantx11forward"
+            android:title="@string/hostpref_wantx11forward_title"
+            android:summary="@string/hostpref_wantx11forward_summary"
+        />
 
-		<EditTextPreference
-		    android:key="x11host"
-		    android:title="@string/hostpref_x11host_title"
-		    android:singleLine="true"
-		    />
+        <EditTextPreference
+            android:key="x11host"
+            android:title="@string/hostpref_x11host_title"
+            android:singleLine="true"
+            />
 
-		<EditTextPreference
-		    android:key="x11port"
-		    android:title="@string/hostpref_x11port_title"
-		    android:numeric="integer"
-		    />
+        <EditTextPreference
+            android:key="x11port"
+            android:title="@string/hostpref_x11port_title"
+            android:numeric="integer"
+            />
 
-	</PreferenceCategory>
+    </PreferenceCategory>
 
 </PreferenceScreen>